updated README

Author: florent champigny

README.md

@@ -134,55 +134,22 @@ ViewAnimator
        .start();
 ```
 
-<<<<<<< HEAD
 Enhanced animations (Thanks [AndroidViewAnimators](https://github.com/daimajia/AndroidViewAnimators),[NiftyDialogEffects](https://github.com/sd6352051/NiftyDialogEffects))   
 ![screenshots](/screenshots/enhanced.gif)
 ```java
-                int random = new Random().nextInt(10);
-                final ViewGroup viewGroup = (ViewGroup) v.getParent();
-                final ImageView imageView = new ImageView(v.getContext());
-                imageView.setImageResource(R.mipmap.ic_launcher);
-                viewGroup.addView(imageView);
-                AnimationBuilder builder;
-                switch (random) {
-                    case 0:
-                        builder = ViewAnimator.animate(imageView).shake().interpolator(new LinearInterpolator());
-                        break;
-                    case 1:
-                        builder = ViewAnimator.animate(imageView).bounceIn().interpolator(new BounceInterpolator());
-                        break;
-                    case 2:
-                        builder = ViewAnimator.animate(imageView).flash().repeatCount(4);
-                        break;
-                    case 3:
-                        builder = ViewAnimator.animate(imageView).flipHorizontal();
-                        break;
-                    case 4:
-                        builder = ViewAnimator.animate(imageView).wave().duration(5000);
-                        break;
-                    case 5:
-                        builder = ViewAnimator.animate(imageView).tada();
-                        break;
-                    case 6:
-                        builder = ViewAnimator.animate(imageView).pulse();
-                        break;
-                    case 7:
-                        builder = ViewAnimator.animate(imageView).standUp();
-                        break;
-                    case 8:
-                        builder = ViewAnimator.animate(imageView).swing();
-                        break;
-                    default:
-                        builder = ViewAnimator.animate(imageView).wobble();
-                        break;
-                }
-                builder.onStop(new AnimationListener.Stop() {
-                    @Override
-                    public void onStop() {
-                        viewGroup.removeView(imageView);
-                    }
-                }).start();
+.shake().interpolator(new LinearInterpolator());
+.bounceIn().interpolator(new BounceInterpolator());
+.flash().repeatCount(4);
+.flipHorizontal();
+.wave().duration(5000);
+.tada();
+.pulse();
+.standUp();
+.swing();
+.wobble();
 ```
+...   
+[![Preview](/EnhancedAnimations.gif)
 
 Path animations (Read http://blog.csdn.net/tianjian4592/article/details/47067161)   
 ```java
@@ -208,20 +175,9 @@ SVG path animations (Read http://www.w3school.com.cn/svg/svg_path.asp)
 </svg>
 ```
 ```java
-    final String SVG_PATH = "M 42.266949,70.444915 C 87.351695,30.995763 104.25847,28.177966 104.25847,28.177966 l 87.3517,36.631356 8.45339,14.088983 L 166.25,104.25847 50.720339,140.88983 c 0,0 -45.0847458,180.33898 -39.449153,194.42797 5.635594,14.08898 67.627119,183.15678 67.627119,183.15678 l 16.90678,81.7161 c 0,0 98.622885,19.72457 115.529665,22.54237 16.90678,2.8178 70.44491,-22.54237 78.8983,-33.81356 8.45339,-11.27118 76.08051,-107.07627 33.81356,-126.80085 -42.26695,-19.72457 -132.43644,-56.35593 -132.43644,-56.35593 0,0 -33.81356,-73.26271 -19.72458,-73.26271 14.08899,0 132.43644,73.26271 138.07204,33.81356 5.63559,-39.44915 19.72457,-169.0678 19.72457,-169.0678 0,0 28.17797,-25.36017 -28.17796,-19.72457 -56.35593,5.63559 -95.80509,11.27118 -95.80509,11.27118 l 42.26695,-87.35169 8.45339,-28.177968";
-    ViewAnimator.animate(view).svgPath(SVG_PATH).repeatCount(3).start();
-```
-=======
-Enhanced animations (Thanks https://github.com/daimajia/AndroidViewAnimations)   
-```java
-ViewAnimator.animate(view).wave().duration(3000).start();
+final String SVG_PATH = "M 42.266949,70.444915 C 87.351695,30.995763 104.25847,28.177966 104.25847,28.177966 l 87.3517,36.631356 8.45339,14.088983 L 166.25,104.25847 50.720339,140.88983 c 0,0 -45.0847458,180.33898 -39.449153,194.42797 5.635594,14.08898 67.627119,183.15678 67.627119,183.15678 l 16.90678,81.7161 c 0,0 98.622885,19.72457 115.529665,22.54237 16.90678,2.8178 70.44491,-22.54237 78.8983,-33.81356 8.45339,-11.27118 76.08051,-107.07627 33.81356,-126.80085 -42.26695,-19.72457 -132.43644,-56.35593 -132.43644,-56.35593 0,0 -33.81356,-73.26271 -19.72458,-73.26271 14.08899,0 132.43644,73.26271 138.07204,33.81356 5.63559,-39.44915 19.72457,-169.0678 19.72457,-169.0678 0,0 28.17797,-25.36017 -28.17796,-19.72457 -56.35593,5.63559 -95.80509,11.27118 -95.80509,11.27118 l 42.26695,-87.35169 8.45339,-28.177968";
+ViewAnimator.animate(view).svgPath(SVG_PATH).repeatCount(3).start();
 ```
-```java
-ViewAnimator.animate(view).shake().duration(3000).start();
-```
-...   
-[![Preview](/EnhancedAnimations.gif)
->>>>>>> master
 
 #Download