minor changes
Fixed conflicts and added testcase to new rewritten database
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/src/database/Database.java
	Server/src/tables/Customer.java
Fixed Conflict 

Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/src/tables/Customer.java