isolated collisions into separate header file
put camera function into header file
camera centered on screen
fix merge conflict
removed shit that's supposed to be ignored..