genScores functions now
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/d4-roshamleader/d4-roshamleader.js
Merge branch 'master' of https://github.com/d4-ideas/Roshambattle