My first commit~ Test.txt file added to the repository.
New File
creating conflict
Merge branch 'master' of github.com:kwakie/Practice