Trying to merger better
Merge branch 'master' of github.com:JEB12345/Sensor_Board
Trying to figure things out for merging...
Conflicts:
	Library/MAG3110.lib
	Library/sn65hvd232.lib
Merge branch 'master' of github.com:JEB12345/Sensor_Board
???
Merge branch 'master' of github.com:JEB12345/Sensor_Board
Changed the Voltage in so that the board will take voltage from the Motor board or supply voltage when the 24V is pulled