removed commented out lined
changed voting and database schema
merged changed from pull
pull merge changes