Added todo comments and fixed bugs
Merge branch 'master' of https://github.com/slockhart/sql-app

Conflicts:
	src/Client.java