1st commit
2nd commit
changed 2nd line in text.txt
added new file
another change
edited readme file
important addition
Merge branch 'testing'
blabla
conflictstuff
Merge branch 'testing'

Conflicts:
	stuff.txt
Merge branch 'master' of https://github.com/Sun0fABeach/testrepo
deleted old readme file