added README2.md after pulling README.md
pushing a conflict in README.md
Merge branch 'master' of https://github.com/DeMarioHamilton/temp1
step 8 again
conflict resolution attempt 1