deleting files to ignore in the future
gitignore
Merge remote-tracking branch 'origin/master' into Geolocation

Conflicts:
	.gitignore