toffee
pyc ql
hay tabla
Merge branch 'master' of https://github.com/Jlabarca/gscholart

Conflicts:
	index.php