git ignore jok3r
cambios login
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/index.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/index.php