Added functionality to save generated data to file
Fixed a merge conflict in DataGeneration.py