platnosci i chyba oceny
Merge branch 'psuminski'

Conflicts:
	Gemfile