Server ex 4 finished
Merge branch 'master' of github.com:TIARDI/ARDI