Refactoring and adding comments
Merge branch 'master' of https://github.com/kellyfj/HereHackWeek
Fix web.xml