Merge pull request #62 from masondesu/eric-fix-branch

removed an employee from the team and location page
Merge pull request #63 from masondesu/eric-fix-branch

updated content in the academy FAQs
on the academy FAQ and class FAQ pages: updated a broken link