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