initial commit
Merge branch 'master' of https://github.com/heliogabal/inkshop

Conflicts:
	.gitignore
.gitignire