feature7
feature9
feature10
Merge branch 'feature10'

Conflicts:
	TestProject/index.html

feature 10 to master
Merge branch 'master' of https://github.com/atnint/testrepository