added new poll page
Merge remote-tracking branch 'origin/master'
salz wrote some stuff