5 commits

Author	SHA1	Message	Date
Jeremy Kauffman	36a992343f	much progress towards a working merge	2017-05-03 23:44:08 -04:00
Jeremy Kauffman	d94ef70f60	more bug fixes	2017-05-02 19:49:02 -04:00
6ea86b96	089572880f	Wallet progress	2017-05-02 18:47:03 -04:00
Jeremy Kauffman	cee2f2a626	watch page is ded	2017-05-02 18:37:54 -04:00
6ea86b96	0d3647c709	Redux proof of concept	2017-05-02 18:24:21 -04:00