init:.gitignore
init:.gitignore
Merge branch '0.1.1'

Conflicts:
	composer.json