stash
Merge branch 'master' of github.com:jperla/ConditionalRandomFields.jl

Conflicts:
	inference.jl