Database Class and Socket Class included
Client sends correct details to the server
Merge branch 'develop'