splashscreen
actualizando repositorio
Merge branch 'master' of https://github.com/efrainastudillo/CalcTris

Conflicts:
	Prueba/project.properties

Signed-off-by: Efrain Astudillo <efrain.astudillo58@gmail.com>