Added
Merge branch 'master' of https://github.com/williamjwd/learn-scala

Conflicts:
	learn-scala-sample/.cache