Step 6. Part 1 of Rules
Fix merge conflict
Merge pull request #7 from carlosagp/step_6

Step 6. Part 1 of Rules
Fix merge conflict for part 7 of CGOL