add 3
Merge branch 'master' of https://github.com/limingwei234/mwli

Conflicts:
	h.java