- Changed tempDisplay for label class

- Started implementing new tempDisplay
Merge branch 'master' of https://github.com/theprophet31337/ForgottenSchism

Conflicts:
	ForgottenSchism/ForgottenSchism/bin/x86/Debug/audio/song/WorldMap.wma
	ForgottenSchism/ForgottenSchism/bin/x86/Debug/audio/song/test.wma
	ForgottenSchism/ForgottenSchism/engine/derpAI.cs
	ForgottenSchism/ForgottenSchism/obj/x86/Debug/ForgottenSchism.exe
	ForgottenSchism/ForgottenSchismContent/obj/x86/Debug/ContentPipeline.xml
	Map Tool/bin/Debug/audio/song/WorldMap.wma
	Map Tool/bin/Debug/audio/song/test.wma