lalalalal
Merge branch 'master' of https://github.com/blazej3k/kosteczki.git

Conflicts:
	ZKimNaBasen/src/Dziecioly/zkimnabasen/MainActivity.java
udalo sie