Merge remote-tracking branch 'boilerplate/master'
Merge remote-tracking branch 'boilerplate/plugins'
Merge remote-tracking branch 'origin/master'
navigation and header graphic
carly STYLE yo
remove font scss