initial push
Merge branch 'master' of https://github.com/alinke/PixelPhoto

Conflicts:
	README.md