Merge pull request #99 from reactjs/features/conditional-rendering

Translate conditional-rendering.md

Author: lxmarinkovic