fix sass
rebuild dist
delete dist, upfate gitignore
update gitignore, delete dist, update gulpfile.js
rebuild
merge from static, rebuild
merge with master, rebuild