deleted unnecessary
Merge pull request #22 from julienam12/master

changes with erin