clear proj
Merge branch 'master' of https://github.com/imuravev/GIS

Conflicts:
	.gitignore