del log
Merge branch 'dev' of github.com:jamehuang2012/logger into dev

Conflicts:
	peripheral.log
Merge branch 'dev' of github.com:jamehuang2012/logger into dev

Conflicts:
	logger.c
	main.c
	peripheral.log