Modified gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/bashinggame/MakeGame.class