Merge pull request #5 from JASheppard/hell-deaths

Fixed merge errors.
Merge branch 'hell-deaths' of https://github.com/MarkL1961/CorsixTH into hell-deaths