log4j

Signed-off-by: huoex <huoex0628@gmai.com>
Merge branch 'master' of https://github.com/huoex/log_demo.git

Conflicts:
	log_demo/src/hex/com/log/printlog.java
	log_demo/src/hex/com/log/printlogTest.java
	log_demo/src/log4j.xml