7
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/original/GameOfLife.java
Real readme