Merge branch 'master' of https://github.com/cole-herrmann/OrcaCare

Conflicts:
	3D/Base.lproj/Main.storyboard
	3D/PlanViewController.m