storing changes before pull
Merge branch 'master' of github.com:jperla/ConditionalRandomFields.jl
fix conflictes
Conflicts:
	test-inference.jl