custom adapter added
Merge branch 'oscar'

Conflicts:
	Educame/bin/classes/co/com/educame/presentacion/MainActivity.class
Merge branch 'master' of https://github.com/ReyesMagos/EducameAPP

Conflicts:
	Educame/.classpath
	Educame/bin/classes/co/com/educame/presentacion/MainActivity.class