Updated to Para 2
Updated Game class
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Text.class
	src/Player.java
	src/Text.java