This should work...
d
Merge branch 'master' of https://github.com/ISPGroup/Term-Project

Conflicts:
	DataBaseApp.java