Updated Player
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Player.java
Updated player.
Updated text, and text, and text.
Merge remote-tracking branch 'origin/master'

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