enter
user model and spec
rspec
test1
test2
dish
Merge branch 'kinga'
order
fix1
fix1
Merge branch 'gapsa'

Conflicts:
	db/schema.rb
*
podishach
Merge branch 'master' into volix
Merge branch 'master' of https://github.com/zarie/apka
Merge branch 'master' into volix
Invitations