text wrapping cleaned up
merge message
Merge branch 'master' of https://github.com/kcecireyes/HW5

Conflicts:
	MemeProgramUser.java