lista lock
Merge branch 'master' of https://github.com/abenedykt/pilka

Conflicts:
	README.md