자동화 시도중. 자막 넣음. auto layout포
Merge branch 'master' of https://github.com/rino0601/CGLapSeoulCityProject

Conflicts:
	photobook/photobook/ONContentsViewController.m