date and delete
Merge pull request #39 from amychiu/amy/development2

date and delete