minh changed to collection view color 1
Merge branch 'master' of https://github.com/sparent/scubahack

Conflicts:
	scubahack/scubahack/AppDelegate.m