test 1 commit.
Merge branch 'master' of https://github.com/yohansson/hello-world

# By yohansson
# Via yohansson
* 'master' of https://github.com/yohansson/hello-world:
  some other checking in 2
  updated newfile1.txt

Conflicts:
	newfile2.txt