fixed?? database
Merge branch 'master' of https://github.com/tombailey/groupcoursework

Conflicts:
	src/DB.java