Implemented the rules of life
Merge remote-tracking branch 'origin/master'
Fixed syntax errors due to merge