commit for merge
commit for merge
Merge branch 'development' of github.com:Whoaa512/meal-balance into development

Conflicts:
	client/layouts/index.html
	client/scripts/main.js
change console.log to return
Database holding 2300 recipes!
fixed restriction check box and recipe name bug
Merge pull request #30 from junejung/development

fixed restriction check box and recipe name bug