Merge branch 'master' into MusicalProgrammer

2018-05-30 21:19:46 -04:00
parent cd0f1617cb
commit 828c0dcb41
16 changed files with 599 additions and 483 deletions
--- a/WorkspaceInstance.h
+++ b/WorkspaceInstance.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "instance.h"
+
+class WorkspaceInstance :
+	public Instance
+{
+public:
+	float timer;
+	int score;
+	WorkspaceInstance(void);
+	~WorkspaceInstance(void);
+};