MVP Complete
Merge branch 'master' of https://github.com/cnorthup/Flickr

Conflicts:
	Flickr.xcodeproj/project.pbxproj
	Flickr.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Flickr.xcodeproj/xcuserdata/charles.xcuserdatad/xcschemes/Flickr.xcschem
e

Flickr.xcodeproj/xcuserdata/charles.xcuserdatad/xcschemes/xcschememanage
ment.plist
	Flickr/AppDelegate.h
	Flickr/AppDelegate.m
	Flickr/Base.lproj/Main.storyboard
	Flickr/CellWithImageCollectionViewCell.h
	Flickr/CellWithImageCollectionViewCell.m
	Flickr/Flickr-Info.plist
	Flickr/Flickr-Prefix.pch
	Flickr/Images.xcassets/AppIcon.appiconset/Contents.json
	Flickr/Images.xcassets/LaunchImage.launchimage/Contents.json
	Flickr/MapViewController.h
	Flickr/MapViewController.m
	Flickr/PhotosCollectionView.h
	Flickr/PhotosCollectionView.m
	Flickr/ViewController.h
	Flickr/ViewController.m
	Flickr/en.lproj/InfoPlist.strings
	Flickr/main.m
	FlickrTests/FlickrTests-Info.plist
	FlickrTests/FlickrTests.m
	FlickrTests/en.lproj/InfoPlist.strings