modified gulp & project structure
Merge branch 'master' of https://github.com/Creego/team1