updated sql file
Merge branch 'master' of https://github.com/TheOctopi/Squid
Merge branch 'master' of https://github.com/TheOctopi/Squid
Merge branch 'master' of https://github.com/TheOctopi/Squid
Fixed conflicts and merged
Merge branch 'master' of https://github.com/TheOctopi/Squid