Small changes.
Merge branch 'master' of https://github.com/kcecireyes/HW5.git
Merge branch 'master' of https://github.com/kcecireyes/HW5.git
merge message
Merge branch 'master' of https://github.com/kcecireyes/HW5

Conflicts:
	MemeProgramUser.java
Trying to see if the upvotes are correct
This may fix my merge problems?
Merge branch 'master' of https://github.com/kcecireyes/HW5

Conflicts:
	src/MemeProgramMain.java