initial commit
updated gitignore
Merge branch 'master' of github.com:mkawalec/geo

Conflicts:
	.gitignore