add shabang
Merge remote-tracking branch 'origin/master' into feature-user-name-env-var

Conflicts:
	test.py