chain counter and initial work on editor
Merge remote-tracking branch 'origin/master'

Conflicts:
	Competitive Pokemon Planner/Competitive Pokemon Planner.iml