added bootstrap
fixed gemfile conflicts
Merge branch 'master' of https://github.com/chasesutton/buffbook