nu ännu bättre...
Merge branch 'master' of https://github.com/f95maem/Git-kursen

Conflicts:
	README.txt