non-working junk that I won't push yet, just committing so I can pull
ugh merge conflicts all I want to do is pull the right version geez
committing d3 demo thing
Merge branch 'master' of heroku.com:cherries-6851
got a lot of stuff working for the animation, still need to have it show each field and hook it up to the command list
Merge branch 'master' of https://github.com/boyers/cherries

Conflicts:
	app/assets/javascripts/models.js.coffee
	app/views/home/index.html.erb
sorry if this breaks things, I had corrupt git files somehow so I'm trying to fix it
merge conflict fixed, how do I have merge conflicts with myself geez
Merge branch 'master' of https://github.com/boyers/cherries
updated the add_child and set_field methods of the animation to work with multiple fields
merged
Merge branch 'master' of https://github.com/boyers/cherries
Merge branch 'master' of https://github.com/boyers/cherries
added AVL tree and splay tree to examples
Merge branch 'master' of https://github.com/boyers/cherries