Changed Java Version
Merge branch 'master' of https://github.com/Daphron/HackMadison.git