ignore workspace
Merge branch 'master' of https://github.com/Bartzlo/ConsoleChat

Conflicts:
	.idea/workspace.xml
Ignore workspace.xml