Merge pull request #7 from Pinwheeler/master

Shift-Option-I now selects the next actor and edits initiative
including initiative reset on ResetAll
converted @Pinwheeler's space to tabs
Merge branch 'master' of github.com:14to9/combat-actors

Conflicts:
	javascript/actors.js

I forgot to pull from upstream before working on latest patch