ball tracking
removed extraneous window code
finializing
finishing touches
final
Merge branch 'master' of https://github.com/cjfman/maslab-team11-2013 into pc
again
mock 1
added threading
Merge branch 'pc'

Conflicts:
	Master/CVCom.py