Video
Merge branch 'master' of https://github.com/anudipa/cse646

Conflicts:
	SmartEye/src/edu/smarteye/sensing/ExperimentControl.java