add text
add Text 2
add bla.txt
Update bla.txt
add content
Merge branch 'develop' of https://github.com/Blodjer/BranchTest into develop

Conflicts:
	bla.txt
Merge pull request #3 from Blodjer/develop

new verison
Merge remote-tracking branch 'origin/master' into hotfix