writing the player controls
Merge remote-tracking branch 'origin/master'

Conflicts:
	map1.txt