Fixing changes for gulp
Deleting shit emoji
Upgrading emoji
bad paths
upgrade node
LINT!
WTF extra icons
Merge branch 'master' into gulp

Conflicts:
	Gemfile
	Gemfile.lock
	app/_scss/.scss-lint.yml