Please work god
please god work
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/MainActivity.apk
	bin/classes.dex
	src/com/example/team04adventure/OfflineStoryList.java
	src/com/example/team04adventure/StoryIntro.java