merge fix
Merge branch 'master' of https://github.com/BradRuderman/meteor_hackathon

Conflicts:
	client/views/readDebate/readDebate.js
working pros/cons