change to testing branch
committing test to master
added index to someissue
added hotfix
finished someissue
Merge branch 'someissue'

Conflicts:
	index.txt
Merge branch 'master' into testing

Conflicts:
	test.txt