Level changes.
Merge branch 'master' of github.com:timoruokonen/latrappe

Conflicts:
	level.map