derby.log
Merge branch 'master' of https://github.com/JamesFoxes/DTU-IT

Conflicts:
	Playground/James/Database/derby.log