Merge branch 'master' of https://github.com/katismile/cross-and-zero

Conflicts:
	.idea/deployment.xml