.
Merge branch 'master' of https://github.com/DanJP-/chris_and_dan_rule into stop_animation

Conflicts:
	game.js
.
scores points for game at 100 speed pipes
Merge branch 'master' of https://github.com/DanJP-/chris_and_dan_rule into scoring

Conflicts:
	game.js
	pipes.js
Merge pull request #18 from DanJP-/scoring

Scoring