Revert "Merges and stuff"

This reverts commit 9d8e25178b47f9f64878d89f08758296bbcec56b.
Merge branch 'develop' of github.com:DAWacker/SleepyScientist into develop
8296bbcec56b.

Conflicts:
	SleepyScientist/SleepyScientist/Game1.cs