made it work !
Merge branch 'master' of https://github.com/kimon-satan/clamourMedia

Conflicts:
	clamourMedia.xcodeproj/project.xcworkspace/xcuserdata/simonkatan.xcuserdatad/UserInterfaceState.xcuserstate
	src/displayListener.cpp
	src/displayListener.h
	src/testApp.cpp
	src/testApp.h
	src/titleRenderer.cpp
trying to merge yikes !
merge worked !