Fixing the test runner script
Fixed merge conflict
Merge branch 'master' of https://github.com/techytux/immolytic