cambios
Merge branch 'master' of https://github.com/lnx1337/panic

Conflicts:
	app.js