conflict
Merge branch 'master' of https://github.com/hessionb/CustomARM

Conflicts:
	MainFiles/conductor.c
	MainFiles/i2cVolt.c
	MainFiles/i2cVolt.h