Testing conflicts
Merge branch 'master' of http://github.com/mlemartien/MySecondRepository

Conflicts:
	data.json