Merge pull request #45 from danisyellis/develop

Probably the final version of #29 for this sprint- merged Mary's and my code
#29