going back to where it was before a lot of stuff
Update Main.java
Merge branch 'candidate'

Conflicts:
	src/main/java/JourneyThroughAvslor/Engine/StoryReader.java
	src/main/java/JourneyThroughAvslor/Main.java

	modified:   src/main/java/JourneyThroughAvslor/Main.java