Merge branch 'j_branch'. Contains view logic
Merge branch 'master' of github.com:CSUChicoSoftwareEngineering/the-engineers into j_branch -j