HEAD
=======
>>>>>>> c8447b2 (apple fixes, cocoapods pain in the ass)
<<<<<<< HEAD
chicoana_viajero_del_tiempo
=======
chicoana_app
>>>>>>> c8447b2 (apple fixes, cocoapods pain in the ass)