Fixed stchuff
fixing everythinggggggggg
Merge branch 'master' of https://github.com/water-bears/thermo

Conflicts:
	Thermo/Thermo.as3proj