first calibration
Merge branch 'master' of https://github.com/miguelespada/makeAwish

Conflicts:
	makeAwish.pde