add gulp to dev dependencies
strange merge wit remotes/origin