Merge pull request #43 from CarrieRider/Dev

Dev
Merge pull request #45 from CarrieRider/Dev

Dev
Merge pull request #44 from TatyaniaM/Dev

Dev
Merge pull request #66 from amandagroccia/dev

Dev