renamed animals added animation
added ajax call to pass json
fixed conflicts
fixed conflicts
Merge branch 'master' into nodeit
stuff