7 Commits

Author	SHA1	Message	Date
Aaron	c3b61c2d95	asdffa	2023-12-05 21:49:23 -05:00
Aaron	df3b8bd0f8	,	2023-12-05 21:37:07 -05:00
Aaron	20be72dbf9	merged?	2023-12-05 21:36:10 -05:00
Aaron	afd7076106	test merge conf	2023-12-05 21:34:23 -05:00
Aaron	626e94b78f	changing some things	2023-12-05 21:29:38 -05:00
Aaron Schinder	459b790012	new	2023-05-01 16:21:18 -04:00
Aaron Schinder	2f17e0dbf3	a new addition	2023-05-01 16:18:32 -04:00