2 commits

Author	SHA1	Message	Date
Katie	c7b04667e0	Format everything	2022-10-28 10:10:11 -04:00
CarlNation	c454c1d5ff	Auto stash before merge of "develop" and "origin/develop"	2022-02-01 08:15:19 -05:00