<mensaje>
Merge branch 'master' of https://github.com/j2deme/strike-counter

Conflicts:
	README.md