added vote functionality and grids
Merge branch 'master' of https://github.com/ysshah/Project2 into thomas

* 'master' of https://github.com/ysshah/Project2: