Merge pull request #1 from joannahwang/dev

committed new change from fork.
changed time.py on upstream again.
delete datetime.py and removed lines in time.py