buscar
cambios
Merge branch 'master' of https://github.com/JonathanGuardado/TransAmerica

Conflicts:
	application/controllers/wheel.php
Merge branch 'master' of https://github.com/JonathanGuardado/TransAmerica