mabiki pdb
new

Merge branch 'master' of https://github.com/atlimited/for_lab

Conflicts:
	plot_free_energy_kernel.R