:)
Merge branch 'Oscar' of https://github.com/jrsescon/AffectDDATopDown into Oscar

Conflicts:
	Library/guidmapper