gitignore prevent all jpgs to be uploaded

[inaciose]

images

*.jpg

possible solutions:

• change the dataset storage folder to a folder outside the repo folder
• change the gitignore to only ignore jpg file above cnn/data folder

[inaciose]

error: The following untracked working tree files would be overwritten by merge:
traxxas_description/meshes/kinect.jpg
Please move or remove them before you merge.
Aborting

[manuelgitgomes]

I believe the later solution you gave looks like the best. I will change that

[inaciose]

Closed by Pull Request 48