updated bootstrap
Merge branch 'master' of https://github.com/borteo/javascript-assignment