cleaned up the gulp file
temp
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gulpfile.js
cleaned up Gulpfile