Make voting work.
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word

Conflicts:
	wordbyword.py
Don't rename imports!