added turn by turn gameplay
resolved conflicts