first commit
update to stable
refactoring
Merge branch 'master' of github.com:cutmail/CameraD

Conflicts:
	.gitignore