first working draft of cafe
Merge pull request #16 from lightalkmst/master

Spellz
Holy shit dude, never put windows newlines in git
Fix bugs in like 3 spells

Detect aliasing caused by bugs like the one in Lady Maid Dream
Log stuff helpful for debugging spells/skills
Useless crafting screen
Make a union_counters to conflict with the one chuan makes later
don't go hard
dont log passwords
some cleanup but modal bug outstanding
Add a thing that generates recipe file
Fix weird bug with json.decode(file_contents(stuff))
some bugfixes - modal bug still in place
Merge branch 'master' of github.com:sharpobject/sgre
fixed modal bug
Merge pull request #17 from lightalkmst/master

Skills Bugfix
Merge pull request #18 from chuanshi/master

Cafe stuff
Merge branch 'master' of github.com:sharpobject/sgre

* 'master' of github.com:sharpobject/sgre:
  fixed modal bug
  Skills Bugfix
  Skills Bugfix
  some bugfixes - modal bug still in place
  some cleanup but modal bug outstanding
  first working draft of cafe

Conflicts:
	mainloop.lua
added missing file
newline
Merge pull request #19 from chuanshi/master

giftable
fixed wedding dress rose
fixed function names