Starting velocity stuff
Merge branch 'master' of https://github.com/MyoBoard/iOSMagicBoard

Conflicts:
	MagicBoard/.DS_Store