Chp6PairProgramming

Chp6PairProgramming
game of life 11/6
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameOfLifeLab/package.bluej