Initial commit
Merge branch 'master' of github.com:rcarjan/xonga

Conflicts:
	.gitignore