tristan final qa for voter
Merge branch 'tristan_voter_challenge' into tristan-master