abstract
Abstract more
Merge branch 'master' of https://github.com/grantdhunter/cmput466-music

Conflicts:
	latex/cmput466-music-paper.tex