..
Merge branch 'master' of https://github.com/olien/rexpixel

Conflicts:
	README.md