Merge commit
Merge branch 'master' of https://github.com/PhilmacFLy/ti-chronos-foo

Conflicts:
	Project/Source/main.c