Test script
Added globallist
Hotfix
Hotfix
Alternative readme
Test merge
Merge branch 'testing'

Conflicts:
	readme.txt
Testbranch commit
Anotherbranch commit
Anotherbranch commit
One more commit
Merge branch 'testbranchlocal'
Merge remote-tracking branch 'testrep/anotherbranch'

Conflicts:
	bar.py