Merge branch 'master' of https://github.com/regison/tp3log540

Conflicts:
bin/ca/etsmtl/log540/tp3/UTFServerNIO.class
src/ca/etsmtl/log540/tp3/UTFServerNIO.java