Code Cleanup
Merge branch 'master' of https://github.com/SEDAWGS/Project12-Web
More Code Cleanup