precomplile for Heroku
simple menu layout
super basic new trip form
style refactor for routes.rb
Merge branch 'master' of https://github.com/MarcGarreau/footprints
added variables
Merge branch 'master' of https://github.com/MarcGarreau/footprints
fixes minor merge conflict in routes & welcome home view
Top navigation bar
Merge pull request #30 from timproctor/trip

Trip Model - model & spec
figaro installed
merged feed-v with master
added fake feed
Merge pull request #32 from MarcGarreau/feed-fake

Feed fake
Saves login instagram posts to hstore
Merge pull request #33 from MarcGarreau/api-playground

Saves login instagram posts to hstore
Formats post created time
created api controller, trips, and posts controller,
created api routes and nested routes for trips and posts"
"
committing unmerged files and merge conflict fixes