Merge remote-tracking branch 'origin/Krisp' into tobi_experimental

.gitignore

@@ -1,4 +1,9 @@
 doble_initial.exe
 *.o
 *.exe
-highscore.txt
+runTests
+stack.o
+test_stack.o
+highscores.txt
+
+stack.o

highscores.txt

@@ -1,10 +1,10 @@
-max20;19879
+Kristin;49209
-max10;9970
+krisp;29797
-max;9965
+krisp;29792
-Kristin;9944
+Kristin;29782
-Kristin;7947
+Kristin;19943
-Kristin;6962
+krisp;19934
-Kristin;5987
+krisp;19916
-Kristin;5975
+kristin;19861
-krisp;4986
+Kristin;19858
-krisp;4985
+p;19729

makefile

@@ -70,9 +70,4 @@ test_binary.o: test_binary.c
 # Clean
 # --------------------------
 clean:
-ifeq ($(OS),Windows_NT)
+	rm -f *.o doble $(STACK_TEST_BIN) $(NUMBERS_TEST_BIN) $(BINARY_TEST_BIN)
-	del /f *.o doble
-else
-	rm -f *.o doble
-endif
-

test_stack.c

@@ -118,7 +118,6 @@ void test_clearStack(void) {
   for (int i = 0; i < 5; i++) {
     stack = push(stack, &testInts[i]);
   }
-  //printf("testints: %d,%d,%d,%d,%d",testInts[0],testInts[1],testInts[2],testInts[3],testInts[4]);
 
   clearStack(&stack);