Merge pull request #1 from CO600GOL/develop

Develop
Removed setup.py as this will be created automatically by the pyramid start-up process
Added Pyramid Alchemy Project to the source code (Feature 42).
Merge pull request #4 from leahcimNosliw/develop

Added Pyramid Alchemy Project to the source code (Feature 42).
Merge remote-tracking branch 'CO600GH/develop' into develop
Merge pull request #5 from richlanc/develop

Deleted setup.py as this will be created by the pyramid installation
Update .gitignore to ignore the env folder and vim swap files
Bug Fix. Programmed by Michael.

Fixed the bug whereby the server wouldn't run because the database could
not be initialised (Bug#67). Server does not work fully, because there
is no database in place, but it will now run.
Merge branch 'bug#67_initialize_{project_name}_db' into develop
Merge pull request #7 from richlanc/develop

Update .gitignore to ignore the env folder and vim swap files
Merge pull request #8 from leahcimNosliw/develop

Develop
Merge pull request #1 from CO600GOL/develop

Develop
Updated Makefile with our project's layout
Merge pull request #2 from CO600GOL/develop

Pulling this
Removed testing of the cell listener and the next button listener. Paired by Michael and Richard.

These tests were having major issues due to threading. How the F*** do you automate testing of
GUIs?
Fixed the Makefile, again, betters suits our project.

Paired by Michael and Richard. The makefile shouldn't require any more changes
*fingers crossed*. Also added the egg info folder to the ignore list, not sure
if correct.
Merge branch 'develop' of github.com:richlanc/Game_of_life into develop
Merge pull request #10 from richlanc/master

v0,3 Release.
Merge pull request #2 from CO600GOL/develop

Develop
Run Table logic created. Paired by Richard and Michael.

We created the logic for the Run table, to be used in the web
application database, and reworked the layout of the python directory to
fit. (Feature #81)