updated files
merge upstream
Merge branch 'master' of github.com:nbroeking/Risk
Merge pull request #7 from jrahm/master

Merge