timer changed
Merge branch 'master' of git@github.com:ossicode/MSP430F1611_I2C_PollingMaster_ISRSlave.git

Conflicts:
	main.c