new weighted.jsp and preferential.jsp
Merge branch 'master' of https://github.com/avaiyahardik/electio

Conflicts:
	Electio/web/voter/weighted.jsp