Merge pull request #1 from CarrieRider/Dev

Dev
Title Change
Merge pull request #4 from amandagroccia/dev

Dev