Se ve bien.....!!! yeah
Merge branch 'master' of https://github.com/jwormc/d1r3ct3l.git

Conflicts:
	DirecTEL/assets/www/index.html
	DirecTEL/assets/www/js/directel.js