Add new file
Fixed Typos
Conflict with Fixed Typos
fixed conflict
big
big_conflict
coolfile.txt
small
conflict with small
small_change
Merge branch 'master' of https://github.com/flysurferrosa/GitPractice