Some bugs added

Will fix tomorrow.
Merge remote-tracking branch 'origin/master'

Conflicts:
	RPG/src/main/Play.java