modified file
Merge branch 'master' of https://github.com/bluetomatoes/LegitLy

Conflicts:
	mysql.js