Merge branch 'master' of
https://github.com/hellocountryman/hellotest.git

Conflicts:
	src/com/example/animationdemo/AnimationMainActivity.java