ready to push to heroku
Merge branch 'master' of github.com:sabard/robin
fix secrets
cmon automerge
adding secrets for heroku
update gitignore
merge conflict
Merge branch 'sabar'