Fixed problems with Db configuration
Merge branch 'master' of https://github.com/Dirichi/ReviewTube

Conflicts:
	src/User.java
Modified User class, and Db Classes
Merge branch 'master' of Dirichi's local repohttps://github.com/Dirichi/ReviewTube

Conflicts:
	src/Channel.java
	src/Display.java