startup data
Merge branch 'master' of https://github.com/BradRuderman/meteor_hackathon

Conflicts:
	client/views/readDebate/readDebate.html
fix
fix
conflicts
merge fix
fixed merge conflicts
ul stuff