updating sass layout and gulpfile
merging