git add all
Merge branch 'master' of https://github.com/Troush/uvote-site