1
Merge commit '668f94320ac4036d9c0c7ba6356a55eb51fcfe18'

Conflicts:
	app/bin/view/guess.html
	app/bin/view/undercover.html
	app/controller/guess.js
	app/controller/punish.js
	app/view/guess.html
	app/view/punish.html