A long time ago, I merged code from the Graphics_Site_Development branch into the UserController branch.
Today (2/23/18), I merged master into the laravel_dev branch and then merged laravel_dev into the UserController branch. A couple of files from the Graphics_Site_Development branch caused conflicts. I deleted some of them and kept some others that were going to be deleted. However, this may pose problems later when @GiselleSerate and I eventually merge our code into master.
Whatever happens in the future, it might be best if the code from the UserController branch goes on master after the code on Graphics_Site_Development. That way, Giselle's changes will persist on master regardless of what happened to them on the UserController branch. At least, that's what I hope :/
Sorry this happened, guys! In the future, we should know to never pull each other's changes without going through master.