Merge pull request #74 from evenge/fran

close #71 integracion continua con GAE
Merge branch 'fran' into Ivan
Merge branch 'master' into Ivan
Merge branch 'fran' into Ivan
Merge remote-tracking branch 'origin/master' into Ivan
Añadido el Dockerfile
Añadidos comentarios y licencias #70
Arreglado corrupto
Modificado dockerfile
Merge branch 'Ivan' into fran