I created a file.
some addition
more edit
Here is the file that I edited for the exercise.
Here is the new file.
new file created
changes
new commit
Merge branch 'testing'

Conflicts:
	cogit.txt
another file.
new files
okay
Merge branch 'master' of https://github.com/asheikh/Exercise