Resolving merge conflicts (doing entire faq again)

schoolapps/faq/__init__.py

schoolapps/faq/admin.py

schoolapps/faq/apps.py

schoolapps/faq/migrations/__init__.py

schoolapps/faq/models.py

schoolapps/faq/templates/faq/faq.html

schoolapps/faq/tests.py

schoolapps/faq/urls.py

schoolapps/faq/views.py

schoolapps/schoolapps/settings.py

schoolapps/schoolapps/urls.py

schoolapps/static/materialize

schoolapps/templates/partials/footer.html

schoolapps/templates/partials/header.html