README
Merge branch 'master' of https://github.com/wowawiwa/pixtest

Conflicts:
	README.md