init new command
edit composer
edit composer
conflict
edit description
gitignore
Merge branch 'develop'

Conflicts:
	.gitignore