alter .gitignore to exclude *.jpg and reset 2 lately commit
Merge branch 'develop'

Conflicts:
	.gitignore
remove *.jpg and * .gif from git not from disk
Merge branch 'develop'