Started on the game
Merge branch 'master' of https://github.com/creativeNameHere/Programming2
Fixed the merge conflict
Conflicts:
	src/Game.java