design galore
Merge branch 'development' of https://github.com/Whoaa512/meal-balance into megantulac

Conflicts:
	client/css/app.css
	client/layouts/main.html
	client/layouts/searchForm.html
	client/scripts/pearsonApi.js
Merge pull request #20 from mtulac/megantulac

logo and homepage design
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	client/scripts/main.js