commiting before pulling changes
Merge branch 'master' of https://github.com/jmarsico/marquee_UDP

Conflicts:
	.DS_Store
	bin/data/settings.xml
	marquee_UDP.xcodeproj/project.xcworkspace/xcuserdata/jakobmarsico.xcuserdatad/UserInterfaceState.xcuserstate
	marquee_UDP.xcodeproj/xcuserdata/jakobmarsico.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	src/testApp.cpp
fixed some issues with gui and added second UDP