Some minor changes has been made
Added methods getScore and getTime, which reads the txt file and returns the wanted variables.
fixed merge conflicts

Conflicts:
	dat255_group3/src/com/dat255_group3/controller/InGameController.java
	dat255_group3/src/com/dat255_group3/controller/MyGdxGameController.java
Merge branch 'develop' of https://github.com/emmawestman/dat255group3 into develop