my index version
Merge branch 'master' of https://github.com/dianaberenguer/proj_rest
Merge branch 'master' of https://github.com/dianaberenguer/proj_rest
correct merge with aleix's changes
images lined from dropbox