5 commits

Author	SHA1	Message	Date
elisa-lj11	aceddb0cf8	merge with james repo	2016-08-30 15:07:01 -07:00
elisa-lj11	bbb80f4a55	hello again	2016-08-30 14:24:00 -07:00
elisa-lj11	074f9e0688	test to merge to status_bar branch	2016-08-30 14:15:27 -07:00
elisa-lj11	8b62c0e712	switching over to a fork	2016-08-30 11:49:49 -07:00
elisa-lj11	6bd41d0dd5	added status bar to marketplace	2016-08-29 18:43:52 -07:00