Fixed some small sql issues
Merge branch 'master' of https://github.com/chaseberry/CSH-Infosys

Conflicts:
	Server.py