添加双机软件LifeKeeper自启动tomcat时发现的一个问题
Merge branch 'master' of github.com:RichardNi/mynote

Conflicts:
	note/README.md