GameParameters
Whyy github be so annoying
Merge branch 'master' of https://github.com/coreybock/pt-assignment-2

Conflicts:
	OOGame/bin/BoardPanel.class
	OOGame/bin/Game$1.class
	OOGame/bin/Game.class
	OOGame/bin/Player.class
	OOGame/src/Game.java