clearing circles
Merge branch 'master' of https://github.com/oherterich/NWS_violins
wither
Merge branch 'master' of github.com:oherterich/NWS_violins
Merge branch 'SafetyBranch'

Conflicts:
	Violins/src/Composition.cpp
conflict resolution
Merge branch 'master' into SafetyBranch