Some more changes
Merge branch 'master' of github.com:martial/mira
Some updates
Merge branch 'master' of github.com:martial/mira
Merge branch 'master' of github.com:martial/mira

Conflicts:
	Reactive.pde
	mira.pde