Adding new file to testing branch
Adding testing.txt to trunk
Added an index.html file
Changing testing.txt
Merge branch 'testing'

Conflicts:
	testing.txt