Merge error
Merge branch 'master' of https://github.com/marcelfarres/UPF.HCI.SaladKingdom
Yeah ! working menu (relative size)
Conflicts:
	Nightfall-of-the-Final-Conquer/app/src/main/res/layout/activity_items_list.xml