stuff
Merge branch 'master' of github.com:nbroeking/Risk
Merge pull request #15 from jrahm/master

stuff