update package file
_*.styl not compiled in gulp tasks
removed sass
merge conflict