not really
Merge branch 'master' of https://github.com/mtchang1/crowd-affinity

Conflicts:
	webapp/webapp/static/css/style.css
	webapp/webapp/templates/phase1answerQuestion.html
not really
not really