hazard forms part2
Merge branch 'master' of https://github.com/jbaycroft/Risktwo