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.cpp
+++ b/WorkspaceInstance.cpp
@@ -0,0 +1,14 @@
+#include "WorkspaceInstance.h"
+float timer = 60.0F;
+int score = 0;
+
+WorkspaceInstance::WorkspaceInstance(void)
+{
+	className = "Workspace";
+	timer = 60.0F;
+	score = 0;
+}
+
+WorkspaceInstance::~WorkspaceInstance(void)
+{
+}