collision
Merge branch 'clientToModel' of https://github.com/lucaspi/AndroidRally into clientToModel