camera view
Merge branch 'master' of github.com:loheiman/Dogma

Conflicts:
	Dogma/Base.lproj/Main.storyboard