try one
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
test
circle looks for bounce
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.txt
Merge branch 'master' into andy_master_merge

Conflicts:
	game.js
Removing shapes from codebase.

Shapes don't work correctly. Rendering is weird, collisions are weird.
Not playing nice with crafty components.