refracted some stuff
removed console logs
Merge branch 'gulp'