Changes to display
Merge branch 'master' of https://github.com/Dirichi/ReviewTube

Conflicts:
	src/Display.java
	src/loginPage.java