Merge branch 'mybranch' into story.txt
Merge branch 'mybranch' into story.txt
Merge branch 'mybranch2' into story.txt

Conflicts:
	README.txt
Merge branch 'story.txt' of https://github.com/JohanSchelling/JS_test01 into story.txt