Renamed Pixel to pxl
Merge remote-tracking branch 'origin/master'

Conflicts:
	prj/src/prj/World.java