submit week4 successfully
Merge branch 'master' of https://github.com/DikangGu/scala_coursera

Conflicts:
	.gitignore