test
Merge branch 'master' of https://github.com/ryanpark/voteMe

Conflicts:
	js/app.js
Merge branch 'master' of https://github.com/ryanpark/voteMe
Merge branch 'master' of https://github.com/ryanpark/voteMe
yue