-- gitignore
Merge branch 'master' of https://github.com/aalexandrakis/KimoDrawer

Conflicts:
	.gitignore
	KimoDrawer.iml