Step 7. Part 2 of Rules
Fix merge conflict for part 7 of CGOL
Merge pull request #9 from carlosagp/step_7

Step 7. Part 2 of Rules