menus
Merge branch 'master' of github.com:maryliag/geladeira

Conflicts:
	Geladeira/Geladeira.qml