test
Merge branch 'master' of https://github.com/jonathanklingberg/ETSN05.git

Conflicts:
	src/database/WorkspaceInstance.java
Merge branch 'master' of https://github.com/jonathanklingberg/ETSN05.git

Conflicts:
	src/database/WorkspaceInstance.java
Test