update
Merge branch 'master' of https://github.com/KAYNguyen/sutrixhmr-2

Conflicts:
	source/assets/css/foundation/components/_global.scss
	source/views/index.jade