Overwrite everything!
Merge branch 'test'

Conflicts:
	hej.txt