?
Merge branch 'dev' of github.com:FolsomCreative/Create into dev

Conflicts:
	Gruntfile.js
	package.json
Fontawesome regex now working. Renamed some stuff.