added stuff
Update README.md
Merge branch 'master' of https://github.com/jdum66/DBFinalProj

Conflicts:
	Edepot.class
	ExternalWorldInterface.class
Merge branch 'master' of https://github.com/BrandonKyleNewman/DBFinalProj
one more day