Merge pull request #12 from Xcreed/master

MAster
MEnsajes e interfaz
Tiempo
Merge pull request #13 from Xcreed/JP

Jp update