to mac mini
Merge branch 'master' of https://github.com/LiamsGitHub/CMSIS_cm3

Conflicts:
	CMSIS_cm3.elf
	CMSIS_cm3.hex
	CMSIS_cm3.lst
	main.c