...
Merge branch 'master' of https://github.com/LAEH/MADpixels

Conflicts:
	madpixels.lua
	process_madpixels.lua