hallo
Merge branch 'master' of https://github.com/embewee/webmining-ex4

Conflicts:
	a.txt