Adding operators for duration
Fixing conflicts

Merge branch 'master' of https://github.com/jcsizemo/Rhythm

Conflicts:
	src/ast.ml
	src/datalib.ml
	src/interpret.ml
	src/parser.mly
	src/scanner.mll