Initial Commit
add gitignore
initial commit
Merge branch 'master' of github.com:miguelbermudez/imgpalette

Conflicts:
	.gitignore