sdf
Fixed merges and updated the gulpfile
updates to tab section
merge testing
merge testing
updates to tabs section