first commit
Merge branch 'master' of github.com:ErikHellman/SimpleCameraDemo

Conflicts:
	.gitignore