lint files

Conflicts:
	gulpfile.js