home_page
Merge branch 'master' of https://github.com/marcelfarres/UPF.HCI.SaladKingdom

stupid git !!!
Conflicts:
	Nightfall-of-the-Final-Conquer/app/src/main/res/layout/activity_home.xml