echo echo test
Merge branch 'scripts-b1'

Conflicts:
	uplogs.sh
Merge branch 'master' of github.com:jingheelu/scripts