Random sync
Merge branch 'master' of https://github.com/camruny/finalProjectPrototype

Conflicts:
	nbproject/private/private.xml
	src/gamePanel.java