collision
Merge branch 'clientToModel' of https://github.com/lucaspi/AndroidRally into clientToModel
Refactored the listener on cards to a seperate class and completed the logic for choosing cards
Merge branch 'clientToModel' of https://github.com/lucaspi/AndroidRally into clientToModel
Some refactoring and cleaned up code
Merge branch 'clientToModel' into development
Merge conflicts fixed