4 commits

Author	SHA1	Message	Date
Jeremy Kauffman	b70f169256	much progress towards a working merge	2017-05-04 11:59:46 -04:00
6ea86b96	b90e35355d	Wallet progress	2017-05-04 11:59:45 -04:00
6ea86b96	8cae067876	Redux proof of concept	2017-05-04 11:59:45 -04:00
6ea86b96	ff9441b955	Redux proof of concept	2017-05-04 11:59:45 -04:00