ya vaaaaaaa MASAAAAAAAAAAAAA MASSSAAAAAAAAAAAAAAAAAAAAAAAAA
Merge branch 'master' of https://github.com/karlosgliberal/basoasuite

Conflicts:
	app/fullpage.html
ARREGLOS