fix stuff
Merge branch 'predy-master' of github.com:H6C5/dinner_dash into predy-master