combined data in to one file and added Computer energy consumption
Merge branch 'master' of https://github.com/shidlovsky/minerva