i was building font-awesome all wrong
Merge branch 'master' of https://github.com/kevrom/node-boilerplate

Conflicts:
	public/lib/_variables.scss
	public/lib/font-awesome.scss
resolved merge, removed empty variables.scss