new stuff
Merge pull request #7 from malloryreuls/newmallorybranch

new stuff