commit greeting
Merge branch 'master' of github.com:guanjun-wang/scala-standard

Conflicts:
	.gitignore