master merge
pre-merge
merge
GUI fix
Merge fix
Add Travis YAML file
Link tunneling to network layer
It is, not it has in README.md
Rename travis.yml to .travis.yml
Merge branch 'master' of github.com:i3anaan/serialkiller
Wander Request
Wander Request
Merge branch 'master' into janjelle
Some improvements to tunneling
Move loading/parsing routes to start method
Fix starter
Routing table parsing will throw exceptions.
Merge remote-tracking branch 'origin/janjelle' into wander-web
Actually start stuff