Poolside changes
Merge branch 'master' of github.com:uf-mil/PropaGator into HEAD

Conflicts:
	z_drive/src/z_drive_class.h
z_drive: added id for 5th servo
Merge remote-tracking branch 'origin/master' into HEAD
Fixed merge errors
Bad merge reverting to "Still trying to debug arduino"

This reverts commit bce55ce15399cd914a0ce4bf5ed7e0df4b1846e8.
Made LidarAngleControl class