updated more files and added more boiler
Merge branch 'master' of github.com:nbroeking/Risk
Merge pull request #12 from jrahm/master

More stuff