fixing button adding in bootstrap
merge haml conflict
Merge branch 'master' of https://github.com/rit/LAplus