Added a ton of shit
wut
wtf is going on
I don't even know anymore
Merge branch 'Nick'

Conflicts:
	SketchPad/Controllers/SketchPadController.cs