time and date
Merge pull request #4 from joao29a/master

time and date