user study
conflict solve
Merge branch 'master' of https://github.com/magiratex/LocalMania

Conflicts:
	sim2/lazy_sim3.m