Merge pull request #36 from amandagroccia/dev

Dev
Merge pull request #37 from TatyaniaM/Dev

Dev
Merge pull request #42 from CarrieRider/Dev

Dev