Merge pull request #7 from bjames105/master

update kayla-branch
Merge pull request #16 from bjames105/kayla-branch

Merge pull request #7 from bjames105/master