Shit got updated, lol!
Merge github.com:stevenrkeyes/2012MASLabTeam6

Conflicts:
	mock2.py
	omni.py