Fixed incorrect merge leftovers
Merge branch 'master' of https://github.com/kerko/digitalforensic

# By nesslinger-it
# Via nesslinger-it
* 'master' of https://github.com/kerko/digitalforensic:
  update experiment memory forensic
  correct some errors in experiment
  update experiment