updated file management
fixed gulpfile
Merge pull request #2 from Eruant/dev

Dev