Primer Commit mie ene 9,16:16. Commit inicial para arrancar con el git.
Merge branch 'master' of https://github.com/renerecalde/weppersonal

Conflicts:
	README.md
jue ene 10,14:52
vie feb 8,15:26
vie feb 8,15:26
Commint con eclipse, mie feb 13, 18:12
Commit antes de empezar. vie feb 15,16:28