camera is fucked, gotta fix so it follows the player
Camera fixed, relates to the player
solved conflicts with develop branch
solving conflicts with camera
merged camera to develop