personal formatting
added bootstrap
Merge branch 'master' of https://github.com/brian-davis/world_cup into andre
moved the shim