Merge branch 'master' of github.com:jaumet/crossreads

Conflicts:
	data/simVector.json
Merge branch 'master' of github.com:jaumet/crossreads

Conflicts:
	data/simVector.json
:Merge branch 'master' of github.com:jaumet/crossreads