Merge branch 'bill' of git@github.com:zot/Leisure.git into roy

Conflicts:
	www/scottfree.lmd
Merge branch 'bill' of git@github.com:zot/Leisure.git into roy

Conflicts:
	www/scottfree.lmd
fix for empty lines in web version
trying to fix clearScreen binding
derp. fix for look
moving clearScreen to a better spot
added 'fix' so when you die your inv is reset
Merge branch 'origin/roy'

* refs/remotes/origin/roy:
  added 'fix' so when you die your inv is reset
  moving clearScreen to a better spot
  derp. fix for look
  trying to fix clearScreen binding
  fix for empty lines in web version