added fire
fixed merge conflict
Merge pull request #39 from oconn/checkoff_vote

Checkoff vote