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
kkk
loool
sss
abedwBR
ppp
Lol, velociraptor
Merge branch 'master' into pablo
 #niewiemjaktootagowac #nsfw #heheszki #polityka