test
image
Merge branch 'develop' into hotfix

mergin, image should be added
jz
en ese sentido
merged
initial commit
hotfix
algo changed
merged
merge manually
changes to algo
merging from hotfix