Fixed bug in ODE class
Merge branch 'master' of https://github.com/schets/LILAC

Conflicts:
	.ycm_extra_conf.pyc
	rundir/lilac
updating before changing computers