quick commit to rebranch
Merge pull request #7 from GSP420/Joshua-Murrill

quick commit to rebranch