21:53
Merge branch 'master' of https://github.com/HazelChen/newBrand.git

Conflicts:
	stave/src/logic/recognition/polymerization/LinePitchToRealPitch.java
	stave/src/logic/recognition/polymerization/Polymerization.java