CamFollow 1.0
Fixing merge conflicts with camera