S
Merge branch 'master' of https://github.com/gragusa/Divergences.jl

Conflicts:
	src/Divergences.jl