Added count and description to powerup/waiting screen.

- Also personalized the messages to make clearer who is responsible for guessing.
Merge branch 'master' of https://github.com/swestwood/proto1-cs247-p3

Conflicts:
	public/javascript/main.coffee
	public/javascript/templateHtml.coffee