merge

diff --combined src/lexer_lex.rl
index 5e395d0,22320d0..22320d0
mode 100644,100755..100644
--- 1/src/lexer_lex.rl
--- 2/src/lexer_lex.rl
+++ b/src/lexer_lex.rl
@@@ -1,8 -1,8 +1,8 @@@
  /* Ragel State Machine for tokenizing text */\r
  #include <stdio.h>\r
  #include <string.h>\r
- #include <apc/apc.h>\r
- #include <apc/parser.tab.h>\r
+ #include "apc.h"\r
+ #include "parser.tab.h"\r
  \r
  \r
  int ipow(int, int);\r