Merging of houghlines on different sections started.
Merge branch 'master' of https://github.com/ltb11/SightReading

Conflicts:
	src/musicrepresentation/PlayedNote.java
	src/org/sightreading/SightReadingActivity.java