Gabriel's Changes added
Merge branch 'master' of https://github.com/iburinoc/risk