13.historia ja te format fa falta contingut
Merge branch '13.historia'

Conflicts:
	bin/TurismeBatea.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/turismebatea/MainActivity.java