test
Merge branch 'trunk' of https://github.com/bogdanneacsa/git-tvb into trunk
Merge branch 'trunk' of https://github.com/bogdanneacsa/git-tvb into trunk
Edit in GIT.
Merge branch 'trunk' of https://github.com/bogdanneacsa/git-tvb into trunk
Git was edited first.
Merge branch 'trunk' of https://github.com/bogdanneacsa/git-tvb into trunk

Conflicts:
	DemoFile.txt
Merge branch 'trunk' of https://github.com/bogdanneacsa/git-tvb into trunk