test6
tes7
Merge branch 'feature3'

Conflicts:
	WebTestHammer/test_strongconsistency.py