buttons created, jumbotron done
fixed binding.pry merge conflict
Merge branch 'master' of https://github.com/zchauvin/revel
fixed intro boxes