Merge pull request #7 from cuappdev/develop

Develop
Merge pull request #8 from cuappdev/eatnow

Eatnow
Merge pull request #9 from cuappdev/eatnow

Eat now template