shit 2
Merge branch 'master' of https://github.com/ltb11/SightReading

Conflicts:
	report/implementation.tex
	report/report.tex