Database
Merge branch 'master' of https://github.com/Zyade/TeamProject

Conflicts:
	TeamProject/src/pkgData/Database.java