reset modal is complete
Merge branch 'master' of github.com:anthonyappcard/multiverseminer

Conflicts:
	src/data/actors.js