fixed the level loader to what it should be
added a player to the level
Merge remote-tracking branch 'origin/master'

Conflicts:
	map1.txt