added movement and shooting
resolve merge conlicts