4 commits

Author	SHA1	Message	Date
Jeremy Kauffman	36a992343f	much progress towards a working merge	2017-05-03 23:44:08 -04:00
Jeremy Kauffman	da538a7a23	many bug fixes, working back button, progress towards working search	2017-05-02 10:21:33 -04:00
Jeremy Kauffman	543b912ddb	more cleanup / restoration	2017-05-02 10:21:33 -04:00
Jeremy Kauffman	71771aeb6f	it's not the worst thing I've ever done	2017-05-02 10:21:33 -04:00