Index fixed and picture id made countable
Merge branch 'master' of https://github.com/PPerfect/PicturePerfect