Fixing error for dev... hopefully
Base of the engine
Merge branch 'master' of ssh://git@github.com/rozzzcorp/thermos.git

Conflicts:
	thermos-desktop/src/com/thermos/Main.java