testing conflicting commits with joe
Merge pull request #2 from jpark1120/master

test commit checking to see merge conflict behavior
testing merge conflcit again
merge conflict resolution practice