brunch init
Merge branch 'master' of github.com:shackspace/dali.js

Conflicts:
	.gitignore
	README.md