Edited to work without json
Merge branch 'master' of https://github.com/cjfman/maslab-team11-2013

Conflicts:
	Master/CVCom.py