renamed the story files
Merge branch 'storyProgress' of github.com:jghibiki/VN-Tycoon into storyProgress
Merge branch 'master' into storyProgress

Conflicts:
	game/Story/Writer/w_event1.rpy