Merge branch 'develop' of github.com:gdodds92/Game_of_life into gdodds92-develop

Conflicts:
	ProjectConway/ProjectConway.egg-info/SOURCES.txt
Fixed to the rules page carried out. Programmed by Michael.

Fixed the Rules page so that the header and footer don't cover the text, the
text is inline with the rest of the web application and so that the page can
be accessed from the top banner. (Support #124)
Merge branch 'develop' of github.com:leahcimNosliw/Game_of_life into leahcimNosliw-develop