tag this
Merge branch 'master' of github.com:buddhabrot/hacktheelections

Conflicts:
	app/js/controllers/play.controller.js