Added empty foo.txt and bar.txt
Hello world in foo.txt
Untrack bar.txt
Retrack bar.txt
Added conflict.txt
Added 18730 in conflict.txt
Deleted 15651 in conflict.txt
Merge branch 'b'

Conflicts:
	conflict.txt
Deleted 15213 in conflict.txt
Added 15213 back into conflict.txt
Added second time in conflict.txt
Merge branch 'b'

Conflicts:
	conflict.txt
Merge remote-tracking branch 'prac/master'
Renamed foo.txt to foo.c and merged from GitHub
Minor modification in README.md
Added local machine identification in print info