changed UTF-16 - UTF-8
Merge origin/master
Merge origin/master
changed String == to string.equals()
added server functionality to main class
Merge origin/master