Final commit before submitting to hackathon
Merge remote-tracking branch 'origin/master'

Conflicts:
	SpaceMan/MainController.py
	webcamPhoto/Controller.py