Merge pull request #33 from CarrieRider/Dev

Dev
reviewed slides
Merge pull request #25 from TatyaniaM/Dev

Dev