New settings'
Changed ip address
Changed ilda repo url
Merge branch 'master' of github.com:sebleedelisle/PixelPyros

Conflicts:
	PixelPyros/bin/data/settings/appSettings.xml
	PixelPyros/bin/data/settings/triggerSettings.xml
	PixelPyros/src/ofApp.cpp