ryan
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/newGameJFrame.java