First script
Improved formatting (functions, comments)
Merge branch 'master' of ssh://github.com/auriferos/scripts-misc

Conflicts:
	gitdis
Improved formatting, added functions