add jquery
updating main
add bootstrap
working flexbox
add bootstrap framework
Merge branch 'master' into gh-pages