Initial commit
Merge branch 'master' of https://github.com/elitzel1/cosas.git
Detalles de productos
Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	.gitignore
	gen/com/clicky/liveshows/R.java
	res/values/strings.xml