Unit conversion
Merge branch 'master' of https://github.com/WMD-Bath/potential_plot

Conflicts:
	.DS_Store