rules v2
Handmade implement
rules v3
Merge branch 'reglas' into preferences

Conflicts:
	contador/res/layout/ly_prefs.xml
	contador/res/values/strings.xml