Second commit
Merge https://github.com/miloszlakomy/Ognisko-klient