sorta more working ultra
Merge branch 'master' of github.com:stephoho/ee149project

Conflicts:
	ultrasonic/ultrasonic.ino