Merge pull request #1 from CO600GOL/develop

Develop
Updated Makefile with our project's layout
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)
Merge branch 'feature#81_web_app_database_run_table' into develop
Time slot table added to database. Paired by Richard and Michael.

The Time Slot table was added to the web application database, in order
to separate information. The Run ID is now used as a foreign key in the
Time Slot table.
Merge branch 'feature#82_web_app_database_time_slot_table' into develop
Merge pull request #11 from leahcimNosliw/develop

Develop
Implemented tests for runs table. Paired by Michael and Richard.

Tests have been implemented in pytest and test: insertion, querying and deletion of the table.
Also changed the folder layout for testing of the pyramid project.
This commit implements support #83 @4h
Merge branch 'develop' of github.com:CO600GOL/Game_of_life into develop
Merge pull request #12 from CO600GOL/master

Fixed Richard's incorrect release
Merge branch 'develop' of github.com:CO600GOL/Game_of_life into develop

Conflicts:
	.gitignore
Merge pull request #13 from leahcimNosliw/develop

Merge testing of runs table into develop.
Merge pull request #2 from CO600GOL/develop

Merge CO600 develop into mine.
Added a test command in the Makefile. Paired by Michael and Richard

Should make testing easier and doesn't require you to be in src/testing; like the src/testing/__init__.py script requires
Merge pull request #14 from richlanc/develop

Merge testing changes into CO600 develop