Merge pull request #77 from JoeStratton/develop

basic faqs page
Update base.html
Merge pull request #78 from JoeStratton/develop

Faq Page Filler
merge code from develop before creating a pr
teacher profile design iteration 1 complete
Merge pull request #79 from BrandonSleater/develop

Teacher Profile Design Iteration 1 Complete