Updated laser tracker.
Merge branch 'master' of https://github.com/pem5134/HackPrinceton

Conflicts:
	.DS_Store