Merged! Feb 12

Finished merge prep, renamed dlhs3 file from feb9 to feb12. Merged DLHS
2 and 3!
Test run

test run for Diff-in-Diff model