User table set up
Merge remote-tracking branch 'origin/master'

Conflicts:
	DataBase.java
functionality added but with unknown errors