working on question box rendering and voting
Merge branch 'master' into jake