changed error function
Merge branch 'master' of https://github.com/ryanlogs/kalipso

Conflicts:
	alternate_train.m