Making a conflict
Merge branch 'master' of https://github.com/kpbadger/test

Conflicts:
	index.html