Adding duration to note format
Merge branch 'master' of https://github.com/jcsizemo/Rhythm

Conflicts:
	src/scanner.mll