exp
Merge branch 'master' into Exp

Conflicts:
	css/global.css
master test
white bg
Merge branch 'master' of https://github.com/ryanpark/voteMe
Merge branch 'Exp'
black bg