Collection view stuff
Merge branch 'master' of https://github.com/KabukiAdam/AdVintage

Conflicts:
	AdVintage.xcodeproj/project.pbxproj
Project fixes
Merge branch 'master' of https://github.com/KabukiAdam/AdVintage

Conflicts:
	AdVintage.xcodeproj/project.pbxproj
Fixed project