IDK
Merge branch 'master' of github.com:Corey255A1/Senior-Design

Conflicts:
	SlaveDriveControl.X/SlaveDriveControl.c
	SlaveDriveControl.X/build/default/production/SlaveDriveControl.o
	SlaveDriveControl.X/dist/default/production/SlaveDriveControl.X.production.elf
	SlaveDriveControl.X/dist/default/production/SlaveDriveControl.X.production.hex
	SlaveDriveControl.X/nbproject/Makefile-genesis.properties