initial state: 27/2/2013
Merge branch 'master' of https://github.com/ProgramacionEvolutiva/PE-practica1