stupid me
Merge branch 'master' of github.com:maxmzkr/shell-scripts

Conflicts:
	firstRunGlobal.sh