Merge pull request #1 from hargriffle/master

Added Team 4's code.

Looks good to me :)
Added team 3's conway game of life
Merge pull request #2 from whilefalse/master

Added team 3's conway game of life - thanks whilefalse!