api setup
resolved merge conflict
edited voterinfo jade file
resolved merge conflicts
fixes