init app commit
Merge branch 'master' of https://github.com/flashvictim/cp_voting

Conflicts:
	index.js