Updating Main.cs
Merge branch 'master' of https://github.com/depstein/ludumdare30
MOAR LOGIC
Merge branch 'master' of https://github.com/depstein/ludumdare30

Conflicts:
	Unity/Assets/People/bob2.xml.meta
	Unity/Assets/People/susieq.xml.meta