Merge pull request #1 from CO600GOL/develop

Develop
Merge pull request #2 from CO600GOL/develop

Pulling this
Merge pull request #14 from richlanc/develop

Merge testing changes into CO600 develop
Merge pull request #3 from CO600GOL/develop

Request for most up-to-date source code.
Merge pull request #15 from richlanc/develop

Merge local develop into group develop
Merge pull request #4 from CO600GOL/develop

Pull Request for the most up-to-date code.
Merge pull request #16 from richlanc/develop

Merge latest version of develop (v0.4) into CO600 develop
Database tests changed. Programmed by Michael, reviewed by Richard.

The database tests now include a test that checks the database
pulls the correct data when it is queried.

All tests now pass (Support #101).
Skeleton framework for Pattern Input view in place. Paired by Michael and Richard.

There is a very basic skeleton framework in place for the above view.
Additionally, the source code layout has been improved to include a lib
directory and a views directory instead of views.py.

(Feature #102)
Resolved conflict and added files for testing.

Paired by Michael and Richard
Resolved conflict.

Paired by Michael and Richard
Refactored the game controller.

Paired by Michael and Richard.
The code was refactored so that it allows access to turn count and 
the play game method was removed, as this would not allow for delay.
This meant that timer was rendered obsolete.
Created an install script for ProjectConway
Merge branch 'develop' of github.com:richlanc/Game_of_life into feature#103_pattern_input_receiver
JSON Receiver for the Pattern Input Page written. Paired by Michael and Richard.

The JSON Receiver view for the pattern input page has been completed and all
tests pass. A setup script has also been created.

All tests now pass (Feature #103)
Merge pull request #18 from richlanc/develop

Integrate JSON pattern reciver into main Develop
Merge pull request #5 from CO600GOL/develop

Local Remote Repository Update
Automated test for HTTP access to the Pattern Input JSON Receiver view. Paired by Richard and Michael.

Testing of the view over HTTP has been automated, with a framework for further HTTP testing
later on in the project also added. Additionally, the MAKEFILE was edited so that the command
make run now works - this sets up the server in development mode and reload.

All tests now pass (Support #106).
Merge pull request #6 from richlanc/develop

Pull Request for the most up-to-date code
Change child process spwaning to use the pexpect

Paired by Michael and Richard.
Pexpect allows use to expect an output within a time, this was perfect
for ensuring that the pyramid had starting serving withint 10 seconds.