poprawka w kontrolerze
Merge branch 'psuminski'
layout
Merge branch 'master' of https://github.com/zarie/apka

Conflicts:
	db/seeds.rb
Merge branch 'psuminski'