test3
Merge branch 'master' of https://github.com/kjartand/helloworld

Conflicts:
	a.txt