try out conflicts

Signed-off-by: peterantkowiak <peter.antkowiak@gmx.net>
Merge branch 'master' of https://github.com/peterantkowiak/githubcourse.git

Conflicts:
	elena2.txt
Merge branch 'master' of https://github.com/peterantkowiak/githubcourse.git

Conflicts:
	elena2.txt