Merge pull request #48 from amandagroccia/dev

Dev
Merge pull request #54 from CarrieRider/Dev

Merge pull request #48 from amandagroccia/dev