changed cells
Merge branch 'master' of github.com:pmatthen/CTTRocks

Conflicts:
	CTTRocks.xcodeproj/project.xcworkspace/xcshareddata/CTTRocks.xccheckout
Revised MainCollectionViewController
Changes to Mainscrollviewcontroller
Merge branch 'master' of github.com:pmatthen/CTTRocks

Conflicts:
	.gitignore
	CTTRocks.xcodeproj/project.xcworkspace/xcshareddata/CTTRocks.xccheckout
	CTTRocks/Base.lproj/Main.storyboard
	CTTRocks/RocksScrollViewController.m