remote changes
Merge branch 'master' of gh:kerinin/environment

Conflicts:
	setup.sh
more