*
Merge branch 'master' of https://github.com/Xcreed/Proyecto-2.git
Update README.md
Merge pull request #4 from Xcreed/JP

Jp
Merge pull request #6 from Xcreed/JP

Jp
Merge pull request #7 from Xcreed/JP

Jp
Merge pull request #8 from Xcreed/JP

Jp
Merge branch 'master' of https://github.com/Xcreed/Proyecto-2.git
GUI
Merge pull request #11 from Xcreed/JP

Jp
Merge pull request #12 from Xcreed/master

MAster