upated gitignore to ignore public/assets
locks sprockets gem, replaces font-awesome gem to resolve precompile issue
Merge branch 'master' into assets-precompile

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.scss