Pusheo papi :D
Pusheo papi :D
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/doapps/me/roypi/Main.java
sazuki tengo sueño !