more laser wrangling
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros

Conflicts:
	PixelPyros/bin/data/settings/appSettings.xml
stuff.