Merge pull request #1 from ZooTypers/master

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

Getting updates.
Fixed post game screens
Merge pull request #88 from cdallas/master

post game screen
Fixed time limit
Merge pull request #89 from cdallas/master

fixed time
post game screen
Merge pull request #90 from cdallas/master

post game screen
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.
remove gen and bin
Merge pull request #92 from dyxliang/master

Remove bin and gen.
Adding in an separate test folder to see if it works.
removing test folder
Removing the unused SQLite database files from ZFR.
Merge pull request #93 from dyxliang/master

Pull
merging with master
i hate merging so much :(