FontAwesome -> 4.2 TwitterBootstrap -> 3.2
github-pages 18 -> 28
Merge branch 'master' of https://github.com/Uko/ghbootawesome-template

Conflicts:
	Gemfile.lock
	index.html