Journey to the centre of the earth
Merge branch 'master' of github.com:PressRedXP/backend

Conflicts:
	src/main/java/Controller.java
Fixed merge hell