Work on menu
Merge branch 'master' of https://github.com/Caligone/cookme
YOLO
Merge branch 'master' of https://github.com/Caligone/cookme

Conflicts:
	WebContent/index.html