latest changes from ec2
Merge branch 'master' of https://github.com/minutheresathomas/Web-Vote