commit

Signed-off-by: franszo <franszo.design@gmail.com>
Merge branch 'master' of github.com:kishandchips/henley

Signed-off-by: franszo <franszo.design@gmail.com>

Conflicts:
	css/editor-styles.css
	css/scss/_layout.scss
	css/style.css