Merge pull request #6 from KellyBlack/Dev

Pulled Amanda's changes into the dev branch
Merge pull request #11 from amandagroccia/dev

Merge pull request #6 from KellyBlack/Dev