Cambio a GIT
Cambio a Yii
Cambio a yii
Merge branch 'master' of https://github.com/m1k3777/vic

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/deployment.xml
	.idea/vic.iml
	.idea/workspace.xml
	app/controllers/PrincipalController.php
	app/database/migrations/2014_05_31_104351_initial.php
	app/database/migrations/2014_06_07_112144_usuarios.php
	app/database/migrations/2014_06_07_112626_direcciones.php
	app/database/migrations/2014_06_12_161134_carrito.php
	app/filters.php
	app/models/Estado.php
	app/models/Producto.php
	app/models/Usuario.php
	app/routes.php
	app/views/layouts/main.blade.php
	app/views/registro.blade.php
	bootstrap/start.php
Merge branch 'master' of https://github.com/m1k3777/vic

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/deployment.xml
	.idea/vic.iml
	.idea/workspace.xml
	app/controllers/PrincipalController.php
	app/database/migrations/2014_05_31_104351_initial.php
	app/database/migrations/2014_06_07_112144_usuarios.php
	app/database/migrations/2014_06_07_112626_direcciones.php
	app/database/migrations/2014_06_12_161134_carrito.php
	app/filters.php
	app/models/Estado.php
	app/models/Producto.php
	app/models/Usuario.php
	app/routes.php
	app/views/layouts/main.blade.php
	app/views/registro.blade.php
	bootstrap/start.php