Added camera movement ingame
Fixed merge conflicts