On branch story2
another change
Merge branch 'story2' of https://github.com/praxisTest/testing into story2

Conflicts:
	story2.html
kept own changes