Merge pull request #19 from bschoen610/master

Almost done with JUnit testing