test sara

test
sara

sara
Merge branch 'master' of https://github.com/SSinC/PicturesqueScene

Conflicts:
	PicturesqueScene/CityCollectionViewController.h
	PicturesqueScene/CityCollectionViewController.m
	PicturesqueScene/ViewController.m