test.txt

fhgkgh
Merge branch 'master' of https://github.com/jkarson/TextEditorProj

Conflicts:
	test.txt
now has a makefile and can read in stuff
Merge branch 'master' of https://github.com/jkarson/TextEditorProj

Conflicts:
	mrbrooksstuff/my_page_edit