updated
deleted
Merge branch 'master' of https://github.com/wakmo/WakHome

Conflicts:

	Workspaces/intelij/home/mytest/mymaven/mymaven-core/src/main/java/wak/onlinetest/closebrother/CloseBrother.java