Final version

Added computation of the final tidy dataset and merging of the data.