test
circle looks for bounce
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.
Moving color changing code only to demo

Objects shouldn't change color in the game when colliding. It's just a
means of verifying collisions are working as desired. Moving that code
into a demo, and making colors not appear in main game.
Adding control options.

Creating player control logic file alice.js.

Defaulting one unit to user control (nicknamed "Alice").

Left-clicking any square will make that Alice, and the old Alice will no
longer be an Alice.

Right-clicking applies velocity changes to Alice.
Implementing more code separation and cleanup
Merge branch 'scenes'

Conflicts:
	src/game.js
Merge and cleanup of code

Merge branch 'master' into alice

Conflicts:
	index.html
	src/game.js
eatMe eat