adds some css and js animation
all merged, all complete
merged correctly