interpolater
Merge branch 'master' of https://github.com/tdjogi010/Interpolator

Conflicts:
	Interpolator/src/main/java/com/mac/interpolator/interpolator/Main_interpolator.java
	Interpolator/src/main/res/layout/layout_main_interpolator.xml