54 commits

Author	SHA1	Message	Date
Jeremy Kauffman	36a992343f	much progress towards a working merge	2017-05-03 23:44:08 -04:00
6ea86b96	7a6dd93886	Downloaded file list kind of working. Not sure about sort.	2017-05-02 19:35:59 -04:00
6ea86b96	089572880f	Wallet progress	2017-05-02 18:47:03 -04:00
6ea86b96	0d3647c709	Redux proof of concept	2017-05-02 18:24:21 -04:00