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

Conflicts:
	game.js
.
Merge branch 'master' of https://github.com/DanJP-/chris_and_dan_rule into collisions

Conflicts:
	game.js
.
Merge branch 'master' of https://github.com/DanJP-/chris_and_dan_rule into collisions
added overlap detection function to bird
Merge pull request #11 from DanJP-/collisions

Collisions