update
Merge branch 'master' of https://github.com/Sunyifan/Digwords into v1

Conflicts:
	scala/src/MyDigger/Digger.scala