test de conflit
Merge branch 'master' of https://github.com/7Robot/Freescale

Conflicts:
	code/readme.txt