Agata -> Waldemar
 Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/abenedykt/io2014-grupa2

Conflicts:
	lista.txt
Merge branch 'master' of https://github.com/abenedykt/io2014-grupa2
Agata -> Waldemar