welp
fixed
Merge branch 'master' of https://github.com/DioVaz/LTW

Conflicts:
	principal.html
	script.js