Combined client and server projects
merged .gitignore