aa

Signed-off-by: Lymke <mickael.rolo@gmail.com>
Merge branch 'master' of https://github.com/Lymke/MultifractalAnalisysWeb2

Conflicts:
	application/models/DistAPI.php

Signed-off-by: Lymke <mickael.rolo@gmail.com>