minh 8pm
Merge branch 'master' of https://github.com/sparent/scubahack

Conflicts:
	scubahack/scubahack.xcodeproj/project.pbxproj
	scubahack/scubahack/MainStoryboard.storyboard