input of experimental data now possible, closes #12, closes #15, resolves #26 and fixes #32
merge conflicts