Merge branch 'master' of github.com:djzion/geometree

Conflicts:
	.gitignore