fixing font awesome
Merge branch 'master' of github.com:InfusionRaleighEvent/more_cowbell

Conflicts:
	TechJam/App_Start/BundleConfig.cs
	TechJam/Content/css/MasterStyles.css