Work.
Merge branch 'master' of github.com:dshum/flute

Conflicts:
	.gitignore
	composer.lock