Zapisnica 7
Merge branch 'master' of https://github.com/justm/teamProject_wolfdogs
renamed columns