Level changes
Merge branch 'suchintanbranch' of https://github.com/suchintan/FightAndFlight into suchintanbranch

Conflicts:
	data/level1.tmx