Merge pull request #16 from csce431-e/master

Update
Merge pull request #62 from jesheffield/master

Update