Fix the bug in vote related function
Merge branch 'master' of https://github.com/lilyringing/testoverwhelm

Conflicts:
	application/controllers/test.php