adds bootstrap
fixes merge conflicts
Merge pull request #19 from rphuber/bootstrap

adds bootstrap