hola
Merge branch 'master' of
https://github.com/danielloureda/tripping-lana.git

Conflicts:
	Trippinglana/src/com/dla/trippinglana/Main.java