Merge pull request #16 from hodorcage/master

[CO] Present i futur
[CO] Historia de la IA
[CO] Historia IA / Biblio
[CO] Arreglat historia
Merge pull request #18 from Valyrion/master

[CO] Historia + bugfixes
[CO]Present i futur

Arreglar coseta