On branch master
 Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
   (use "git pull" to update your local branch)

 Changes to be committed:
	deleted:    README.txt

 Untracked files:
	.gitignore
Merge branch 'master' of https://github.com/Jumast/Algo1

Conflicts:
	README.txt

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 On branch master
 Your branch and 'origin/master' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)

 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   helloWorld.pas

 Untracked files:
	.gitignore
 On branch newFunctionality
 Changes to be committed:
	modified:   helloWorld.pas

 Untracked files:
	.gitignore
 On branch newFunctionality
 Changes to be committed:
	modified:   helloWorld.pas

 Untracked files:
	.gitignore