So it works lmao. Kinda.
dude, I have no idea what I did
Merge remote-tracking branch 'origin/master' into mike

Conflicts:
	User.h
	a.out