Merge master
Merge pull request #11 from Arquisoft/Front-end-Principal

Rama principal del front-end