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
Fixed bug whereby a new environment could not recognise the projectconway directory. Paired by Michael and Richard

The bug was fixed by changing the directory from which setup.py
is run for development inside the makefile. All tests now work.

(Bug#96)

 Please enter the commit message for your changes. Lines starting
Removed TimeSlot table from web app database. Paired by Michael and Richard.

(Feature #97)
Integrated TimeSlot data into Run table. Paired by Richard and Michael.

Data that had been in the TimeSlot table is now in the Run table according
to the new database design (Feature #98).
Contact information on setup.py added. Paired by Richard and Michael.

The setup.py file in the ProjectConway directory has been updated  with
information on who wrote the project, where the project can be found and
how to contact the authors. This information will be added to the PKG-Info
file next time the web application is set up for development.
Made the makefile tests verbose

Paired by Michael and Richard.
GOL Controller changed to translate from multiline string. Paired by Michael and Richard.

After formalisation of the representation of pattern grids outside of the game engine,
the Game Of Life Controller had to be changed from translating 2D Int Arrays to multiline
strings.

This has now been done and all tests pass (Feature #99)