Merge pull request #5 from Gadgetronica123/master

c
Merge pull request #6 from Gadgetronica123/server

Merge pull request #5 from Gadgetronica123/master