/recipes view
Merge branch 'master' of https://github.com/evansimpson/olin-dining-hacks into gree-initial-explorations
Merge branch 'master' of https://github.com/evansimpson/olin-dining-hacks into gree-initial-explorations

Conflicts:
	app.js
	package.json
Merge branch 'master' of https://github.com/evansimpson/olin-dining-hacks into gree-initial-explorations
some page frameworks
Merge pull request #7 from EvanSimpson/gree-initial-explorations

Gree initial explorations