update file
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/sass/layout/_footer.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/sass/layout/_header.scss
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
update file
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/layout/header.jade
	templates/pages/landing/parts/accessories.jade
	templates/pages/landing/parts/showcase.jade
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
update file