Take workspace.xml out of git

Conflicts:
	.idea/workspace.xml