Fixing up front-end stuff
Merge pull request #20 from CSUChicoSoftwareEngineering/s_branch_bugfixes

Fixing up front-end stuff
Merge branch 'master' of github.com:CSUChicoSoftwareEngineering/the-engineers into j_branch_2