recomment from other proj dir
Merge branch 'master' of github.com:sshaman1101/stm32-learning

Conflicts:
	cox_test.cogui
	cox_test.coproj
	cox_test/Debug/bin/history.xml
	cox_test/Debug/obj/dependencies.xml
	cox_test/Debug/obj/history.xml
	cox_test/cox_test.elf.xcodeproj/project.pbxproj