Added calculations for score and correct time on game over screen
fixed merge conflict

Conflicts:
	dat255_group3/src/com/dat255_group3/controller/InGameController.java
	dat255_group3/src/com/dat255_group3/controller/MyGdxGameController.java