Merge pull request #1 from CO600GOL/develop

Develop
Merge pull request #2 from CO600GOL/develop

Pulling this
Merge pull request #3 from CO600GOL/develop

pull time.
Rules page began. By Geoff
Rules page began. By Geoff
Rules view. By Geoff
Merge pull request #4 from gdodds92/develop

Pull to create rules page
Completed Rules page. Paired by Geoff and Niklas.
The Rules page has now been completed pending minor asthetic fixes. The
test has been written, animated GIF images added into a logical layout.
Merge branch 'Ru' of github.com:gdodds92/Game_of_life into Ru
Merge pull request #5 from gdodds92/Ru

Merge Rules Page into develop branch
Fixed both the issues that managed to find there way into develop.

At the point of pull, the tests failed and the site would not start o_O
Merge branch 'develop' of github.com:gdodds92/Game_of_life into gdodds92-develop

Conflicts:
	ProjectConway/ProjectConway.egg-info/SOURCES.txt