UTF-8
Merge branch 'master' of github.com:pasosdeJesus/adJ

Conflicts:
	arboldd/usr/local/adJ/actbase.sh