user can now vote on a deck
Merge branch 'master' of https://github.com/kmills006/2013-04_MDD-2sided

Conflicts:
	2013-04_MDD-2sided/js/main.js