Midi Control
Merge branch 'master' of https://github.com/martial/mira

Conflicts:
	AbstractAnimation.pde
	mira.pde