Merge branch 'gh-pages' into dev
#2 added Bootstrap and Font Awesome
Merge branch 'dev' into gh-pages