Merge branch 'master' into test-suite

Conflicts:
	Makefile

diff --cc Makefile
index 582f0aaa7fdd2978bf9590a1b64d61888c9bae4e,5486dd13eaf68e5da1fca94b230d0fe904b8bc65..89168d76aa7fa5c8142e3924794d421bb11a46fd
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -44,17 -46,12 +48,18 @@@ qcvm: $(OBJ_X
  gmqcc: $(OBJ_C) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
  
 -all: gmqcc qcvm
 +test: $(OBJ_T)
 +      $(CC) -o $@ $^ $(CFLAGS)
 +      
 +runtests:
 +      ./test
 +
 +all: gmqcc qcvm test
  
  clean:
 -      rm -f *.o gmqcc qcvm
 +      rm -f *.o gmqcc qcvm test *.dat
-       
++
+ 
  $(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h
  main.o: lexer.h
  parser.o: ast.h lexer.h