Merge pull request #8 from andreqi/master

update dev
Merge pull request #9 from andreqi/jc

Merge pull request #8 from andreqi/master
info restaurant front end
Merge pull request #10 from andreqi/jc

info restaurant front end
Merge remote-tracking branch 'origin/master' into backend_info

Conflicts:
	.gitignore