committing all files
committing
Merge branch 'master' of
https://github.com/sdonaxistracking/seniordesign.git

Conflicts:
	OnAxisTracking/Debug/OnAxisTracking
	OnAxisTracking/Debug/src/test.o
	OnAxisTracking/src/test.c