asfd
Merge branch 'master' of github.com:daweim0/gridman

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