Caroline's work: Fixed fortify and made other changes.
Merge branch 'master' of ssh://github.com/stilden1/Risk