committing main file before updating ADC changes
Merge branch 'master' of github.com:JEB12345/SSB_Code

Conflicts:
	Sensor_Board/main.c