Attempting to bring my 9 month old copy of the firmware up to currenty.
I need to merge my configurations with the current master.

 	modified:   Makefile
 	new file:   ThermistorTable.h
 	modified:   config.h
Merge branch 'master' of https://github.com/jwygralak67/Teacup_Firmware

Conflicts:
	ThermistorTable.h
Commiting the generic double ThermistorTable.h