Merge pull request #13 from jrahm/master

Have two endpoints connecting.
Fixed
Did alot of work
Hola
Merge branch 'master' of github.com:nbroeking/Risk
Merge branch 'master' of github.com:nbroeking/Risk