Merge branch 'master' of https://github.com/scalableinternetservices/baconwindshield into smallChange
Merge branch 'master' of https://github.com/scalableinternetservices/baconwindshield into frontpageEdit
added jumbotron + some bootstrapping and small bug fixes
fixed merge conflict
removed a gem, as well as a .png
fix
Merge pull request #26 from scalableinternetservices/bootstrap2

Added jumbotron + some bootstraping, removed manage favorites if not logged in