commit
Merge branch 'master' of github.com:jamehuang2012/logger

Conflicts:
	logger.h