messy
Merge branch 'master' of https://github.com/peterantkowiak/githubcourse

Conflicts:
	elena2.txt