reseni bordelu v gitu

Signed-off-by: sinacek <sinacek@gmail.com>
Merge branch 'master' of github.com:sinacek/SkautIS