version-1
prueba boostrap
interface v2
Merge branch 'master' of https://github.com/PriCode/AprendeYA

Conflicts:
	appAprendeYa/protected/data/aprendeya.sql
	appAprendeYa/protected/runtime/application.log
Merge branch 'develop'

Conflicts:
	appAprendeYa/protected/data/aprendeya.sql~
	appAprendeYa/protected/runtime/application.log

modificado