Merge branch 'master' of github.com:RosstheRoss/TestingFun

2 files changed, 13 insertions, 1 deletions

diff --git a/ee1301/wk0/wk0.cpp b/ee1301/wk0/wk0.cpp
new file mode 100644
index 0000000..5ea8196
--- /dev/null
+++ b/ee1301/wk0/wk0.cpp
@@ -0,0 +1,13 @@
+// Lab 0
+// Matthew Strapp
+// 2018-01-23
+//
+// This program displays a message to the screen
+#include <iostream>
+using namespace std;
+
+int main()
+{
+cout << "Hello!" << endl;
+return 0;
+}
diff --git a/test.c b/test.c
deleted file mode 100644
index a2e5dde..0000000
--- a/test.c
+++ /dev/null
@@ -1 +0,0 @@
-// This is just me messing with things to see if anything happens.