initial commit comment
Merge branch 'master' of https://github.com/jiangwei1221/geotag

Conflicts:
	.gitignore