Fixed mixed tabs/spaces in HTML file
Merge pull request #1 from ndhoule/development

Fixed mixed tabs/spaces in HTML file
Fixed indentation, missing semicolons
Fixed indentation; missing semicolons; misspelled var name
Merge pull request #2 from junejung/development

WIP test API
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	client/scripts/pearsonApi.js
Merge pull request #3 from ndhoule/development

Style, indentation, misspelled var name, missing semicolon fixes
Merged junejung-development; WIP : pearsonAPI gets data
refactored the search form and setting up html structure
Implemented basic routing
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