merge
Merge branch 'master' of github.com:nisibear/testdemo

Conflicts:
	testfetch.txt