fix minor less.js bug
fix merge conflict
Going through a poll works!!!!!!!!! Awesome