Changes in Script.js
Merge branch 'master' of https://github.com/avaiyahardik/electio
Merge branch 'master' of https://github.com/avaiyahardik/electio

Conflicts:
	Electio/web/js/script.js
Changes in script.js and electionDetails.jsp