Merge pull request #26 from taliascotchbrook/taliabranch

commit before presentation