Merge pull request #47 from CarrieRider/Dev

Dev
Merge pull request #48 from TatyaniaM/Dev

Dev
Merge pull request #70 from amandagroccia/dev

Dev