start creation of join query
show who you voted for
Merge branch 'master' of https://github.com/cjameszhang/cs411

Conflicts:
	hello/db.py
	hello/views.py
Merge pull request #8 from paultgibbons/master

Add a join query to show who you have voted on