First commit
Merge branch 'master' of github.com:cannikin/language-haml

Conflicts:
	README.md