valami 1
Merge branch 'master' of https://github.com/makacslajhar/codename-petra

Conflicts:
	README.md