8 commits

Author	SHA1	Message	Date
elisa-lj11	aceddb0cf8	merge with james repo	2016-08-30 15:07:01 -07:00
elisa-lj11	f2e61aa504	added status bar to marketplace	2016-08-29 18:43:32 -07:00
James B. Pollack	2b2b2ecbac	caps	2016-08-29 17:44:33 -07:00
James B. Pollack	d3aad53e0e	cleanup	2016-08-29 17:43:32 -07:00
James B. Pollack	2a12f2feae	marketplaces html	2016-08-29 17:27:39 -07:00
James B. Pollack	95c627aa71	dev	2016-08-29 14:24:36 -07:00
James B. Pollack	264176dac6	css	2016-08-26 14:21:32 -07:00
James B. Pollack	382cbd0a73	start	2016-08-26 14:16:37 -07:00