Update gitignore
Update gitignore
Just checking the proj and this file appeared???
Fixed conflict with gitignore
Merge remote-tracking branch 'origin/jose' into dev
Deleted useless files
Merge remote-tracking branch 'origin/jose' into dev