Merge pull request #18 from URWhiteboard/master

Update Jacob
Merge pull request #19 from URWhiteboard/jacob-test

Merge pull request #18 from URWhiteboard/master