.Sql edits
Merge branch 'master' of https://github.com/softish/DBAssignment

Conflicts:
	src/model/QueryExecuter.java