Sync
Merge branch

Conflicts:
	src/newGameJFrame.java