created flickr map view controller
zoomed in on current location
added two container view controllers, one for map, one for slideshow collection
refactored flickrviewcontroller to pass location to map view controller on loading
resizing image annotation
got collection view to display images
flickr images now displaying correctly on a map
refactored by creating an image object
fixed annotation view to properly show callout in the middle of the image
removed ds_store file
merged in the flickr-map branch