CollectionView 추가
Merge branch 'master' of https://github.com/rino0601/CGLapSeoulCityProject

Conflicts:
photobook/photobook/en.lproj/MainStoryboard.storyboard
Merge branch 'master' of https://github.com/rino0601/CGLapSeoulCityProject

Conflicts:
	photobook/photobook/en.lproj/MainStoryboard.storyboard