This is the for real merge with updates

Final Boss logic, as well as fixing the bullet and shark collision detections