...
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChromeChrusher/src/chromechrusher/Camera.java
...
Merge branch 'master' of https://coffeechriph@github.com/coffeechriph/chromechrusher.git