WIP : pearsonAPI gets data
Merged junejung-development; WIP : pearsonAPI gets data
Implemented basic routing
Merge branch 'development' of https://github.com/Whoaa512/meal-balance into megantulac
Merge pull request #5 from mtulac/megantulac

refactored the search form and setting up html structure
Migrated index template to its own index.html file
Fixed mis-indented html, added todo notes
Merge branch 'development' into router

Conflicts:
	client/layouts/main.html
Merge pull request #6 from ndhoule/router

Implemented basic routing, split index out into own template file
Cleaned up templating, css
Merge branch 'development' into router
api give us the data that by cuisines
Merge pull request #7 from ndhoule/templating

Templating improvements
Merge branch 'development' of github.com:Whoaa512/meal-balance into development

Conflicts:
	client/layouts/main.html
	client/scripts/main.js
	client/scripts/pearsonApi.js
Merge branch 'development' of https://github.com/Whoaa512/meal-balance into megantulac
Merge branch 'development' of github.com:Whoaa512/meal-balance into development

Conflicts:
	client/layouts/main.html
Merge pull request #8 from junejung/development

Api get only cuisine data. merge fixed
pulled search form out into its own file
Merge branch 'development' of https://github.com/Whoaa512/meal-balance into megantulac
Fixed regression introduced by merging upstream