Vote support in word.py
Merge branch 'database' of https://github.com/ncss-2014-group-3/word-by-word into database

Conflicts:
	database/database.db
	database/word.py
Fixed db obj bug
Merge branch 'database'