4 commits

Author	SHA1	Message	Date
Emily	650d30c4bc	fix merge conflicts	2018-08-09 15:58:02 -07:00
Emily	4ee497a83f	minor ui fixes	2018-08-08 17:24:58 -07:00
Emily	bf16e5c8a9	integrate with new ui	2018-08-08 11:07:09 -07:00
Emily	c9ae76b209	hook multifile to ui	2018-08-03 16:10:00 -07:00