ddd
Poprawka w formularzu dodawania dania.
Merge branch 'master' of github.com:zarie/apka into asiabaj
Edycja widoku #new dla dish.
Merge branch 'asiabaj' of github.com:zarie/apka into asiabaj

Conflicts:
	app/views/dishes/new.html.haml
ajax
Merge branch 'psuminski'

Conflicts:
	app/views/users/_user.haml
Merge branch 'master' of https://github.com/zarie/apka
kkk
ajax w paneu admina
Merge branch 'master' of https://github.com/zarie/apka
Merge branch 'psuminski'
poprawka ajaxa
poprawki w panelu admina
Merge branch 'psuminski'
form invitation
form payment
Merge branch 'master' of github.com:zarie/apka
loool
sss