edited .gitignore
Merge branch 'master' of github.com:kinolongcom/kkPHP

Conflicts:
	.gitignore