Editing
Merge branch 'master' of github.com:lgauthie/octo-chords

Conflicts:
	specification/final_report.tex