stuff
gMerge branch 'master' of github.com:brandonwamboldt/werewolf

Conflicts:
	views/moderator.handlebars