New rule description - Expected a conditional expression and instead saw an assignment
New rule explanation: Did you mean to return a conditional
Fixing the variable naming in an example
Merge pull request #11 from jklein/master

Two new rule descriptions