First commit
Merge github.com:rista86/zipi-games

Conflicts:
	.gitignore