new function and folder
hz text
Merge branch 'haml'

Conflicts:
	scss/start.sass