Crazy State (states generally)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Shrimp/Main.cpp