update
Merge branch 'master' of https://github.com/ichelite/voting

Conflicts:
	js/map.js