Merge pull request #12 from amelialaundy/dev_branch

Dev branch