splash screen y chula la compra
imagenes a la shit
probando probando
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AlbumBrazil/AndroidManifest.xml
	AlbumBrazil/src/com/example/albumbrazil/MainActivity.java
Merge pull request #8 from memocostecho/master

date