Revert "test merge in branch"

This reverts commit 18eed7e18d8c3bbff6c458ca6cd32eca18d0d63e.

Conflicts:
	index.html
test again
test again in master
Merge branch 'master' into branchA