added effect and animation
resolved conflict
Merge pull request #22 from avneev/avnesh-animate

Avnesh animate