added bootstrap 3 and bootstrap js
Merge branch 'master' into bootstrap