Change main
Merge origin/master

Conflicts:
	src/GameProject.java