Merge branch 'help' into trunk

diff --cc Makefile
index 8363fde0a617465e28f8603fdf5fc5cfb4eaacfa,a6836acd27c8209ec3be813fcd81beb136c5eded..5a5b4b878e0a7268171a8a7c400bbc7a373cc2a4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -21,21 -21,11 +21,22 @@@ INCLUDE := $(addprefix -I, $(INCDIR)
  SRCDIR := src
  
  SOURCES :=    main.c                          \
 -                      scene.c                         \
                        manipulation.c          \
 -                      parsing.c                       \
 +                      tokenize.c                      \
 +                      parse.c                         \
 +                      parse_rt.c                      \
 +                      parse_small.c           \
 +                      parse_elements.c        \
 +                      scene.c                         \
 +                      scene_helpers.c         \
 +                      intersect.c                     \
 +                      circumsphere.c          \
 +                      cylinder.c                      \
 +                      sphere.c                        \
 +                      plane.c                         \
 +                      object_color.c          \
                        vec3.c                          \
+                       utils.c                         \
  
  SOURCES := $(addprefix $(SRCDIR)/, $(SOURCES))
  

diff --cc inc/miniRT.h
Simple merge