dillon changes
conflicts cleanup
added error handling to gulpfile
mobile nav fix
Merge remote-tracking branch 'origin/dillon'
sutff