03.10.13-10.57
Merge branch 'master' of github.com:shamanix/webcam

Conflicts:
	README.md
03.10.13-11.02