minor edits
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into devbranch
Put in new Flickr API key
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into devbranch