..
Merge branch 'master' of github.com:paolino/medibox

Conflicts:
	Sequencer.hs
euclidean