Camera now follows player
Merged conflicts