fixed reading in SQL from file
Merge branch 'master' of https://github.com/johnprock/315

Conflicts:
	src/main.cpp