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

Conflicts:
	mrbrooksstuff/my_page_edit.c
fixed merge issues
Merge branch 'master' of github.com:jkarson/TextEditorProj
Merge branch 'master' of github.com:jkarson/TextEditorProj
cock
Merge branch 'master' of github.com:jkarson/TextEditorProj
nuts
starting pacman