Messing with ViewController stuff
Merge branch 'master' of https://github.com/MyoBoard/iOSMagicBoard

Conflicts:
	MagicBoard/MagicBoard.xcodeproj/project.pbxproj
wut