Javascript
Merge branch 'master' of https://github.com/Jordan-Bortolotti/twx

Conflicts:
	public_html/lib/lib.php