Fixes conflict
Changes sidebar
t push origin master
git push heroku master
:wq
Merge branch 'master' of https://github.com/xenda/notroccola