fix font awesome
Merge pull request #1 from caarlos0/font-awesome-fix

fix font awesome
Merge branch 'master' into turbolinks

Conflicts:
	css/up.css