updated to bootstrap 3
Merge branch 'pr/1' into gh-pages

Conflicts:
script.js
Merge branch 'gh-pages'