changes to meals since sunday in company model and seeds file
Merge branch 'development' of github.com:alexshook/beat_tadashis_team into development
changes to formatting on show page
merge conflict on user show page