#
Merge branch 'master' of https://github.com/mihaistoie/sikia

Conflicts:
	.gitignore