Final commit before switching to bootstrap 3
Merge branch 'master' of https://github.com/Dehli/portfolio