Foo bar
Foo bar
Merge branch 'master' of https://github.com/ErikHellman/SimpleCameraDemo

Conflicts:
	README.md
Merge branch 'master' of https://github.com/ErikHellman/SimpleCameraDemo

Conflicts:
	README.md
Merge branch 'master' of https://github.com/ErikHellman/SimpleCameraDemo

Foo