fixing to do combined fit
Got new combine fit code to compile
Merge branch 'master' of github.com:hickerson/UCNA