...
Merge branch 'Sami-working-on-client-side' of https://github.com/SamiTriki/ProjectPlannerClient into Sami-working-on-client-side

Conflicts:
	.idea/workspace.xml
	src/com/kippysaventure/projectjva/connectionToServ.java