.gitignore update
Merge branch 'master' of github.com:site-me/yii-cartridge-inventory

Conflicts:
	.gitignore