Fixed casing
Been working on the main page.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/controller/MainController.java