JUnit Tests
Merge remote-tracking branch 'origin/dev' into dev_JUnitTests
Merge pull request #35 from MTVaught/dev_JUnitTests

JUnit Tests Sprint 2