Merge pull request #8 from jrahm/master

added server socket again
Commit
hello
Added Event Marshling Strategy
fixed stuff
fixed warning in server socket
Added GamestateMarshilingStrategy
Fixed
Merge branch 'master' of github.com:nbroeking/Risk
started server proxy. Fixed spelling