initial flickr api call working
flickr displaying 20 photos
minor edits
Merge branch 'master' of github.com:ambertunnell/worldview
adds photos and articles controllers
Updates show page, weather fix