init
Merge branch 'master' of github.com:codarz/ImageNarius

Conflicts:
	.gitignore