added basic form for voting
updated show page
merged voting