ignore phpstorm project files
Merge branch 'master' of https://github.com/smartinmedia/cunity

Conflicts:
	.gitignore