add master.txt

Signed-off-by: janwen <jianwen.lou@b5m.com>
Merge branch 'master' of ssh://git@github.com/janwen/gitdemo.git

Conflicts:
	java/master.txt