v1 of the combine files function, still no Saving
added save functionality
added protocol=2 to pickle dump in calc-coherence function
changed to protocol=2 on pickle dump
Finished combine_files fucntion which creates .npz of all data
Merge branch 'lk-branch'
resolving conflicts