New layouts

Creadas dos capas.
Modificadas variables string y colors.
Añadido mi nombre al diccionario.
Merge branch 'master' of https://github.com/marcelfarres/UPF.HCI.SaladKingdom
this is a faklsdjf !
Conflicts:
	Nightfall-of-the-Final-Conquer/app/src/main/res/layout/activity_items_list.xml
	Nightfall-of-the-Final-Conquer/app/src/main/res/values/strings.xml