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

Conflicts:
	documents/test.pdf