Start of calibration
Merge branch 'master' of https://github.com/angieskazka/spaceshaker.git

Conflicts:
	3dtouch.html
Merge branch 'master' of https://github.com/angieskazka/spaceshaker.git