Traducción y framework  pdf
Mas
Merge branch 'master' of https://github.com/scuig/yasgaga

Conflicts:
	app/assets/images/test.png
	app/controllers/materials_controller.rb