Bootstrap 3 update
Merge branch 'master' of http://github.com/phili9p/phili9p.github.io