my styles
Merge branch 'master' of github.com:teamwinit/yahoohackusa

Conflicts:
	public/js/controllers.js
	views/templates/vote-screen.html