Stuff
Merge.
Merge branch 'master' of https://www.github.com/Golden-Eagle/pxljm14

Conflicts:
	src/pxljm/PxlJm.cpp