changed
second commit on branch?
Merge branch 'master' of github.com:marcusstigelid/grendosan-IT

Conflicts:
	Testar.txt