4 commits

Author	SHA1	Message	Date
Jeremy Kauffman	1dedb9873c	more fixes but not all of the fixes :(	2017-05-09 21:33:13 -04:00
6ea86b96	4b5187bc7f	Better search	2017-05-07 19:50:32 +07:00
6ea86b96	29c53a9bf8	Search kind of working, but nasty	2017-05-05 15:01:16 +07:00
Jeremy Kauffman	36a992343f	much progress towards a working merge	2017-05-03 23:44:08 -04:00