Merge branch 'branch' of http://github.com/Nick-Verdegem/test-repo into ...

...branch