unfinished work pre-merge/rebase
resync
animation fix

Fixed animation so it drops (and stops) properly. Merged Lorena's code
as well. This should be "current" before merging Susan's code into the
js.
Merge branch 'develop' of git://github.com/Camwyn/connect-four into develop

Conflicts:
	index.html
	js/c4.js
	js/connect.js
Merge pull request #33 from zcdziura/develop

Merge fix for https://github.com/OctopodGames/connect-four/pull/32