fixes
commit before pulling
think whichWord parsing debugged
prepping for notebook reintegration
umm seem to be blowing the stack now, grrrr
fixed local token pack usage
committing before pull
fixing playGame func
added todo item
Merge branch 'origin/roy'

* refs/remotes/origin/roy:
  added todo item
  fixing playGame func
  committing before pull
  fixed local token pack usage
  umm seem to be blowing the stack now, grrrr
  think whichWord parsing debugged
  commit before pulling
  fixes

Conflicts:
	core/runtime.coffee
	lib/generatedPrelude.ast
	lib/runtime.js
	lib/runtime.map
tweaked launch
checkpoint
Merge branch 'origin/bill'

* refs/remotes/origin/bill:
  checkpoint
  tweaked launch
  prepping for notebook reintegration
mod operator
adding new prims
undoing my changes before merge
have to commit before i can pull again
Merge branch 'bill' of https://github.com/zot/Leisure.git into roy
adding floor prim to test
beefed up prim math functions