test
test1
Integrating changes to run experiments with virtual machines
Merge branch 'feature/vm' of github.com:mcolmant/powerapi into feature/vm
Merge branch 'develop' into feature/vm
Cleaning up the code
Merge branch 'feature/vm' into develop