Works for some reason
Merge remote-tracking branch 'origin/master'

Conflicts:
	MonochromeRainbow.userprefs
	MonochromeRainbow/Classes/Player.cs
	MonochromeRainbow/MonochromeRainbow.pidb

	MonochromeRainbow/bin/Debug/MonochromeRainbow-unsigned/Application/app.exe

	MonochromeRainbow/bin/Debug/MonochromeRainbow-unsigned/Application/app.exe.mdb

	MonochromeRainbow/bin/Debug/MonochromeRainbow-unsigned/Application/shaders/Texture.cgx
	MonochromeRainbow/obj/Debug/app.exe
	MonochromeRainbow/obj/Debug/app.pdb
	MonochromeRainbow/obj/Debug/convertedpdb/app.exe.mdb