ok
Merge branch 'master' of https://github.com/staldeh/commandline

Conflicts:
	hej.txt