Matt
Merge branch 'master' of https://github.com/7Robot/Freescale
Merge branch 'master' of https://github.com/7Robot/Freescale

Conflicts:
	code/src/main.c