Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java

error

Merge remote-tracking branch
'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java
	src/ru/mocapps/crazyfish/sprite/AnimateFish.java

Commin

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java
	src/ru/mocapps/crazyfish/sprite/AnimateFish.java

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java
	src/ru/mocapps/crazyfish/sprite/AnimateFish.java

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	src/ru/mocapps/crazyfish/main/FishActivity.java
	src/ru/mocapps/crazyfish/sprite/AnimateFish.java

add
fishPArts
err
Merge remote-tracking branch 'origin/master'