removing continuations from parser
Merge branch 'origin/master'

* refs/remotes/origin/master:
  scottfree fixes
  many fixes to scottfree !
  latest work, but puts parser in an infinite loop ?
  think adv data file parsing is completed!
small fix
latest work
overwriting these due to conflicts
fixes to scottfree
scottfree fixes
adding notepad++ config file
fixes to scottfree after parser fixes made
Merge branch 'origin/newMonadCodeGen'

* refs/remotes/origin/newMonadCodeGen:
  small fix
  removing continuations from parser

fixed new code generator

Conflicts:
	lib/browser.js
	lib/generatedPrelude.js
	lib/repl.js
	lib/repl.map
	lib/runtime.map
Merge branch 'origin/roy'

* refs/remotes/origin/roy:
  fixes to scottfree after parser fixes made
  adding notepad++ config file
  scottfree fixes
  fixes to scottfree
  overwriting these due to conflicts
  latest work
prompt
switched repl to use Leisure's load function
Merge branch 'origin/roy'

* refs/remotes/origin/roy:
  switched repl to use Leisure's load function
  prompt
  fixes to scottfree after parser fixes made
  adding notepad++ config file
  scottfree fixes
  fixes to scottfree
  overwriting these due to conflicts
  latest work
  small fix
  removing continuations from parser