version counter up
Merge branch 'minimal'

Conflicts:
	package.json