Cleaning up caused bugs
Merge branch 'master' of https://github.com/leschinois/reseaustrausskahn

Conflicts:
	nkahn/server.ml