hello world
added text
append new text
renamed newfile to file2
class work
Merge https://github.com/dkibbe/cis239dl
Merged for Pull
Conflicts:
	file1
Merge https://github.com/dkibbe/cis239dl