Merged from sample app, added meals model and controller