src/Game.java
Merge branch 'master' of https://github.com/ronaldiscool/FinalProject

Conflicts:
	src/Game.java
Merge branch 'master' of https://github.com/ronaldiscool/FinalProject
I've made it so main method is now in GameServer and renamed some classes.