merge conflict fixed
Merge branch 'master' of https://github.com/ltb11/SightReading