updated program so it now has the time
Added time functions
Merge branch 'master' of https://github.com/halegge/python