Merge branch 'Sidebar'
Merge branch 'master' of heroku.com:fangate2