Merge pull request #1 from potenshia/master

canvis_marc
new version
Merge branch 'master' of https://github.com/aszkid/FSIA

Conflicts:
	documents/test.pdf
UPDATED sfml find dir
[PR] FPS check | [CO] Seccions teoriques i pràctiques
Spacing....
[CO] Distribucio conceptes
[CO] Esquema privatiu