fixed a fault in the text file
fixed the level loader

accidentally somehow got a timestamp in the level loader
Merge remote-tracking branch 'origin/master'

Conflicts:
	map1.txt