Part y
Started linking the server and the applet.
Merge remote-tracking branch 'origin/master'