conflictemacs randoText.txt
fixed conflicts -lily
Merge branch 'master' of github.com:alpearce/cis350