se añadio algo
asd
Merge branch 'master' of https://github.com/yusukejoan12/aulanet

Conflicts:
	application/views/forum/topic.blade.php