Playtest 2_2 guard city
Merge branch 'origin/master'