Customize bootstrap
Merge branch 'master' of github.com:newdavej/pinteresting

I deleted .gitignore~ via the github website, so now it says my local project is behind the one on github