NEPULLOVAT
Merge branch 'master' of https://github.com/hektokotylove-rameno/skladisko

Conflicts:
	skladisko/db/seeds.rb