mattbasta/ivote-teama — pull request #23 by bashtech (2012-03-08 21:11:57+00:00)
Title: Merge Brians changes.

Merged in Brian's changes to the entities and fixed any conflicts the changes had with my user code.

Added the updated Site.css from Matt's directory.

Added Brian's functional test file.