changes after I got macBook back
Merge branch 'master' of https://github.com/codeofRobin/parseWithCollectionViewController

Conflicts:

parseWithCollectionViewController.xcodeproj/project.xcworkspace/xcshared
data/parseWithCollectionViewController.xccheckout