platnosci i chyba oceny
Merge branch 'psuminski'

Conflicts:
	Gemfile
popsulem gefile o.O
update
Estetyka kodu modeli.
Merge branch 'master' into pablo

Conflicts:
	app/models/order.rb
	app/models/user.rb
Merge branch 'master' into pablo