rough cross_val, updated features to acutally
Merge branch 'master' of https://github.com/JackFosterTerwilliger/epileptic_dogs

Conflicts:
	matlab/cross_val.asv