Dumb macbook Code.
Merge branch 'Assignment1' of https://github.com/Borzen/Awe into Assignment1

Conflicts:
	Awe.sdf
	Editor/MainForm.cs
Fixed to all