config for devise
Returned routes.rb to prev
Merge branch 'master' of heroku.com:artstream
Syncing local and heroku