merge conflict
Merge branch 'master' of https://github.com/rocketscience-projects/javaslang

Conflicts:
	.gitignore