adding a line on github site
updating again on github
merge
Merge branch 'master' of https://github.com/darren-trx/testing

Conflicts:
	README.md
Renamed README
testing2 new file
Update testing2-file

edit on github
another edit on github
local edit
added ...
reverting to testing2-file
Merge branch 'master' of https://github.com/darren-trx/testing
test
test2
test3
test34
reverting to old README
testing2 branch
bugfix
test4