Update .gitignore
Merge branch 'master' of https://github.com/neverbot/Pixelazr

Conflicts:
	.gitignore