Combiner Implemented and working, but is not cute... though
ShowActivity implemented and linked to the combiner and the list. Working but stills ugly
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/psi14/udc/es/thewardrobe/ListClothActivity.java
	app/src/main/res/values/strings.xml
Everything works fine :P