Upload 1&2 solution
Merge branch 'master' of https://github.com/XiaobinH/EnergyDataSimulationChallenge