4-15 updates

updated through chapter 6
file parser.hs changed to lisp.hs