bug fixes
Merge branch 'master' of https://github.com/neilhem/template

Conflicts:
	css/font-awesome.css
	sass/bootstrap.scss