Q-function using ERF
Merging...
Merge branch 'stats'

Conflicts:
	clojure/project.clj
Multi-thread sim working

Still need to get the channel side working