zmeny
Merge branch 'master' of https://github.com/hektokotylove-rameno/skladisko
Blbne mi git, toto ignorovat
Merge branch 'master' of https://github.com/hektokotylove-rameno/skladisko

Conflicts:
	skladisko/app/controllers/operations_controller.rb
Merge branch 'master' of https://github.com/hektokotylove-rameno/skladisko

Conflicts:
	skladisko/app/controllers/operations_controller.rb
Expirable attribute for containers
Merge branch 'master' of https://github.com/hektokotylove-rameno/skladisko