made some changes
Merge pull request #2 from michellemarek/michelles-edits

made some changes