committing changes in order to pull
Merge branch 'master' of https://github.com/water-bears/thermo

Conflicts:
	Thermo/src/PlayState.as
added transition state
Merge branch 'master' of https://github.com/water-bears/thermo

Conflicts:
	Thermo/obj/ThermoConfig.old
	Thermo/obj/ThermoConfig.xml
Merge branch 'master' of https://github.com/water-bears/thermo
um i don't even know what this is