test32
stash
Merge branch 'master' of github.com:EilevHagen/GitExtensionTest

Conflicts:
	test32.txt