2 commits

Author	SHA1	Message	Date
minenice55	6297980922	fix all merge conflicts ... unfortunately we lost a good chunk of git history in the process so that may hurt the ability for this to get merged, may have to consult everyone else for this	2022-08-09 11:23:17 -04:00
adianfiuef	34a12a514c	Tram&Pauline ... Animation mostly done perfectly	2022-07-25 01:04:16 -07:00