Merge branch 'gh-pages'
deleted bootstrap template, changed footer link to github
Merge branch 'master' into gh-pages