grid layout
gemfile lock for heroku
added dotenv gem, fixed oauth
Merge branch 'master' of https://github.com/mjseaman/stacked
added .env file for tokens
omniauth
conflicts