test
test3
hola
Merge remote-tracking branch 'origin/test' into test

Conflicts:
	SPA-APP/src/com/example/spa_app/MainActivity.java
test4