6 Commits

Include renames

Author	SHA1	Message	Date
R. Aidan Campbell	05fb400879	Refactored popups into a new class	2018-04-29 08:17:31 -07:00
R. Aidan Campbell	23b3fb5af0	Merging master	2018-04-29 07:20:47 -07:00
Cameron Gutman	a5d50cd4f0	more work	2018-04-28 22:14:27 -07:00
Cameron Gutman	a38bef6bc4	pairing stuff	2018-04-28 19:01:00 -07:00
R. Aidan Campbell	e5c336223c	Now with a picture-button that does a thing	2018-04-28 17:21:05 -07:00
Cameron Gutman	63d1c4abdf	Initial work	2018-04-28 15:39:50 -07:00