TC 6 and 7 completed
gitigore updated to include derby.log
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore