sdf
 new changes
Fixed merges and updated the gulpfile
thursday night edits