Merge pull request #1 from ZooTypers/master

Getting updates.
Merge pull request #2 from ZooTypers/master

Getting updates.
Merge pull request #3 from ZooTypers/master

Getting updates.
Adding in the JUnit jar for testing; adding timeouts to all tests;
changing up the tests in accordance to new code.
Forgot to add in the JUnit jar.
Merge pull request #91 from dyxliang/master

Adding in some changes to the tests and the JUnit jar.