started a new level
Merge remote-tracking branch 'origin/master'

Conflicts:
	Thermo/src/levelgen/AS3Embed.as
added a quick flash freeze with trapdoor level
Merge branch 'master' of https://github.com/water-bears/thermo