I have changed everything
Merge remote-tracking branch 'origin/zideljan'

Conflicts:
	README.md
	alice.txt