Fixing Git errors
Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	webcamPhoto/Controller.pyc
	webcamPhoto/View.pyc
Updating date time
Merge remote-tracking branch 'origin/master'

Conflicts:
	webcamPhoto/Controller.pyc
	webcamPhoto/PygameDisplay.pyc
	webcamPhoto/View.pyc
Updating date time
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fixing controller bug