pruebas
pruebas
deshacer bootstrap
deshacer bootstrap
Merge branch 'master' of https://github.com/agustincl/anguilaperro
Merge branch 'master' of https://github.com/agustincl/anguilaperro
Merge branch 'master' of https://github.com/agustincl/anguilaperro
login and logout process
groups
Merge
Merge branch 'master' of https://github.com/AnikaEDC/anguilaperro into AnikaEDC-master

Conflicts:
	.buildpath
Merge branch 'master' of https://github.com/agustincl/anguilaperro

Conflicts:
	application/controllers/Author.php
	application/views/author/login.phtml