Starting off with gulp boilerplate
Fixed merge