initial revision of hello world
added new files.
this is the next commit.
this is the next bit.
added the footer
Merge branch 'experimental'

Conflicts:
	newfile1.txt
Merge remote-tracking branch 'origin/master'