CAN working on MOTOR board
Merge branch 'master' of github.com:FrauBluher/PMSM into Jonthan_CAN

Conflicts:
	Motor Driver Code/PMSMx/PMSM.c
Merge branch 'master' of github.com:FrauBluher/PMSM into Jonthan_CAN

Conflicts:
	Motor Driver Code/PMSMx/PMSM.c
Trying to merge with master....
testing the new Postition controller
seems to not be working properly?
Remved all the MPLabX build files from PMSMx's index
Merge branch 'CAN_Testing' of github.com:FrauBluher/PMSM into CAN_Testing

Conflicts:
	Motor Driver Code/PMSMx/BasicMotorControl.c
	Motor Driver Code/PMSMx/PMSM.c
	Motor Driver Code/PMSMx/PMSMBoard.c
	Motor Driver Code/PMSMx/PMSMBoard.h
	Motor Driver Code/PMSMx/build/default/production/BasicMotorControl.o
	Motor Driver Code/PMSMx/build/default/production/CircularBuffer.o
	Motor Driver Code/PMSMx/build/default/production/DMA_Transfer.o
	Motor Driver Code/PMSMx/build/default/production/DRV8301.o
	Motor Driver Code/PMSMx/build/default/production/LQG_NoiseCharacterization.o
	Motor Driver Code/PMSMx/build/default/production/PMSM.o
	Motor Driver Code/PMSMx/build/default/production/PMSM.o.d
	Motor Driver Code/PMSMx/build/default/production/PMSMBoard.o
	Motor Driver Code/PMSMx/build/default/production/PMSMBoard.o.d
	Motor Driver Code/PMSMx/build/default/production/PMSM_Characterize.o
	Motor Driver Code/PMSMx/build/default/production/PMSM_Characterize.o.d
	Motor Driver Code/PMSMx/build/default/production/PRBSCharacterization.o
	Motor Driver Code/PMSMx/build/default/production/SPIdsPIC.o
	Motor Driver Code/PMSMx/build/default/production/cordic.o
	Motor Driver Code/PMSMx/build/default/production/main.o
	Motor Driver Code/PMSMx/build/default/production/main.o.d
	Motor Driver Code/PMSMx/dist/default/production/PMSMx.production.elf
	Motor Driver Code/PMSMx/dist/default/production/PMSMx.production.hex
	Motor Driver Code/PMSMx/dist/default/production/PMSMx.production.map
	Motor Driver Code/PMSMx/main.c
	Motor Driver Code/PMSMx/nbproject/Makefile-default.mk
	Motor Driver Code/PMSMx/nbproject/Makefile-genesis.properties
	Motor Driver Code/PMSMx/nbproject/Makefile-local-default.mk
	Motor Driver Code/PMSMx/nbproject/configurations.xml
	Motor Driver Code/PMSMx/nbproject/private/configurations.xml
	Motor Driver Code/PMSMx/nbproject/private/private.xml
Removed all the text editor backup files (~) from the repo