boy I wish I could test these fixes myself before I send them haha kill me
Merge branch 'master' of https://github.com/wainwt2/Transcendance

Conflicts:
	TranscendGame/Library/assetDatabase3