its done

the tire fix
Merge branch 'master' of https://github.com/vivianaranha/AndroidClass

Conflicts:
	do it again