finished initiative
Merge branch 'master' of https://github.com/ianbrode/rpg_helper

Conflicts:
	combat.js