Updated SpoilBallotEvent and starting to update Tap to deal with #3, #4, and #18. Will revise the test now.
Updated the ballot store to retrieve ballots by their BID's, and also updated the Supervisor's spoil ballot process. #3, #4, #18
Fixed the spoil ballot mechanism to be more correct in preparation of the ChallengeBallotUploadEvent. #4, #18.
Starting a revision of the Adder crypto code to address #33.
Started changes regarding #4 and #18. Working on revamping for webserver tallying/decrypting. Currently working on the relationship between Supervisor and Tap. NOTE: ERRORS PRESENT IN FILES AS OF THIS COMMIT
Merge remote-tracking branch 'origin/WebserverRevision' into WebserverRevision
Successfully revised the way Adder Elections decrypt the final election results. Also refactored the AdderTest class, EncryptedTallierWithNIZKs, and  Ballot Encrypter. Addresses #33
Merge branch 'master' into CryptoRevision

Conflicts:
	crypto/adder/Election.java
Merge remote-tracking branch 'origin/WebserverRevision' into WebserverRevision

Conflicts:
	supervisor/model/tallier/EncryptedTallierWithNIZKs.java
Updated the commented out tallier code to reflect changes in the crypto. Fixes #33.
Added a ballot class that the Precinct class can deal with, as part of #38.
Implemented the Precinct class as per #38.
More changes involving #4, #18, and #36, #37, #38. Working on relationship between Supervisor and Tap, as well as Supervisor and other Supervisors, and Supervisor, BallotStore, and Talliers. Still errors present in parts of this code as refactoring continues.
Code revision to Model.java
Added events for the ballot uploading process and updated all of the event listeners. Cannot test at this time due to compilation errors. Fixes #37. Fixes #36
Merge remote-tracking branch 'origin/WebserverRevision' into WebserverRevision
Working on refactoring BallotStore.java and Supervisor.java by implementing Precinct.java
Added some status getters for these machines to cleanup some code (BallotScannerMachine.java, SupervisorMachine.java, VoteBoxBooth.java)
Separated PinTimeStamp.java from BallotStore.java. Working on implementing PIN functionality directly into Model.java
Regarding #38 #39:

-Resolved all of the syntax errors from moving functionality.
-PINs exist in Model.java but probably don't function properly yet.
-Changed the language in Precinct.java from 'challenged' to 'spoiled' as the default and deleted challengeBallot().
-Fixed some old code in ActiveUI.java that was giving syntax errors.
-Added hashing code into Model.java, but that probably doesn't function yet either until it's formally introduced.