other stuff
Merge branch 'master' of https://github.com/black-duck/test-temp

Conflicts:
	index.html