gemfile update
crud for entries, text and photos
add title to entries
dynamic maps framework is present; stop/show page test have been built
merge
user can see place page with place name, description, photo, & map
Merge remote-tracking branch 'ilias/show-maps' into show-maps
finish merge
commit
javascript extracting place data
merge
entries capybara test
functioning description via freebase api
added gems
merge
Merge remote-tracking branch 'etan/freebase-api' into freebase-api
slight changes
fixed flickr keys
Merge pull request #8 from renagadex2/updated-flickr

fixed flickr keys
creating stops/working on creating places