update structure
Merge branch 'master' of https://github.com/wyTrivail/game2.0

Conflicts:
	src/main/java/com/game/Main.java