Test-project is a project mainly written in Java, it's free.
this is a test project to experiment how to use git <<<<<<< HEAD
22:28 22:30 added this line in hotfix
line added in issue 53
comes back from the hotfix, continue working on issue 53 22:48
added in GitHub
this is added in test-project3
test-project3 added another line!
git hub added a line again!