Merge branches 'master' and 'marinabranch'
Merge pull request #1 from marinaelmore/marinabranch

Marinabranch
Delete callDelite.pyc
Delete parsefile.pyc
Update README.md
Merge branch 'marinabranch'
Committing changes to merge
Merge branch 'master' into marinabranch