2 new
Merge branch 'HEAD' of git@github.com:shiaukuan/kuan.git into HEAD

Conflicts:
	kuan/src/main/java/kuan/kuan/App.java
6