Added nocpv, inputs and outputs
Merge branch 'master' of https://github.com/RolfAndreassen/CharmMixingFit

Conflicts:
	lhcb_note/latex/fit_variants.tex
	lhcb_note/latex/fit_variants.tex~
	lhcb_note/latex/main.log
	lhcb_note/latex/main.out
	lhcb_note/latex/main.synctex.gz
	lhcb_note/latex/measurements.tex~