added history
fixed merge conflict
added bin/
version for demo
changed add meal to popup, added history
.gitignore changed
Merge branch 'demo'

Conflicts:
	.gitignore