reverted to java 1.6
Merge branch 'master' of github.com:quaffle97/game-off-2013