Added configfiles from server and client
merge merge

Merge branch 'master' of github.com:kaar/liu