changed price field to float, renamed type column in dishes table to dish_type
Merge remote-tracking branch 'origin/master'