added Feng's parts
Merge branch 'master' of https://github.com/orchidproject/Location-game-orchid